- moved gl_interface.cpp/h to gl_load folder.

These files are not part of the actual renderer but part of the system code.
This means, for separated modern and legacy GL renderers, there still will only be one set of this, unlike everything else.

src/CMakeLists.txt

@@ -1046,7 +1046,7 @@ set (PCH_SOURCES
 	gl/stereo3d/gl_quadstereo.cpp
 	gl/stereo3d/gl_sidebyside3d.cpp
 	gl/stereo3d/gl_interleaved3d.cpp
-	gl/system/gl_interface.cpp
+	gl_load/gl_interface.cpp
 	gl/system/gl_framebuffer.cpp
 	gl/system/gl_debug.cpp
 	gl/system/gl_wipe.cpp

src/gl/compatibility/gl_20.cpp

@@ -37,7 +37,7 @@
 
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_lightdata.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/scene/gl_drawinfo.h"

src/gl/data/gl_vertexbuffer.cpp

@@ -29,7 +29,7 @@
 #include "doomtype.h"
 #include "p_local.h"
 #include "r_state.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/data/gl_vertexbuffer.h"

src/gl/data/gl_vertexbuffer.h

@@ -28,7 +28,7 @@
 #include <mutex>
 #include "tarray.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "r_data/models/models.h"
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/scene/hw_skydome.h"

src/gl/models/gl_models.cpp

@@ -37,7 +37,7 @@
 #include "i_time.h"
 #include "hwrenderer/textures/hw_material.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"

src/gl/renderer/gl_lightdata.cpp

@@ -26,7 +26,7 @@
 **/
 
 #include "gl/system/gl_system.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"

src/gl/renderer/gl_postprocessstate.cpp

@@ -27,7 +27,7 @@
 
 #include "templates.h"
 #include "gl/system/gl_system.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 

src/gl/renderer/gl_postprocessstate.h

@@ -2,7 +2,7 @@
 #define __GL_POSTPROCESSSTATE_H
 
 #include <string.h>
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "r_data/matrix.h"
 #include "c_cvars.h"
 #include "r_defs.h"

src/gl/renderer/gl_renderbuffers.cpp

@@ -27,7 +27,7 @@
 
 #include "gl/system/gl_system.h"
 #include "v_video.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/renderer/gl_renderer.cpp

@@ -38,7 +38,7 @@
 #include "swrenderer/r_swscene.h"
 #include "hwrenderer/utility/hw_clock.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"

src/gl/renderer/gl_renderstate.cpp

@@ -29,7 +29,7 @@
 #include "doomstat.h"
 #include "r_data/colormaps.h"
 #include "gl/system/gl_system.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/shaders/gl_shader.h"

src/gl/renderer/gl_renderstate.h

@@ -24,7 +24,7 @@
 #define __GL_RENDERSTATE_H
 
 #include <string.h>
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "r_data/matrix.h"
 #include "hwrenderer/scene//hw_drawstructs.h"
 #include "hwrenderer/textures/hw_material.h"

src/gl/scene/gl_flats.cpp

@@ -37,7 +37,7 @@
 #include "p_lnspec.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_lightdata.h"

src/gl/scene/gl_portal.cpp

@@ -35,7 +35,7 @@
 #include "d_player.h"
 #include "g_levellocals.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"

src/gl/scene/gl_scene.cpp

@@ -42,7 +42,7 @@
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/dynlights/gl_lightbuffer.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/renderer/gl_lightdata.h"

src/gl/scene/gl_skydome.cpp

@@ -29,7 +29,7 @@
 #include "g_levellocals.h"
 #include "textures/skyboxtexture.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"

src/gl/scene/gl_sprite.cpp

@@ -40,7 +40,7 @@
 #include "actorinlines.h"
 #include "r_data/r_vanillatrans.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "gl/renderer/gl_lightdata.h"

src/gl/scene/gl_walls_draw.cpp

@@ -28,7 +28,7 @@
 #include "actorinlines.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"

src/gl/scene/gl_weapon.cpp

@@ -29,7 +29,7 @@
 #include "r_utility.h"
 #include "v_video.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "hwrenderer/scene/hw_weapon.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/shaders/gl_postprocessshader.cpp

@@ -23,7 +23,7 @@
 #include "gl/system/gl_system.h"
 #include "v_video.h"
 #include "w_wad.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"

src/gl/shaders/gl_shader.cpp

@@ -35,7 +35,7 @@
 #include "vm.h"
 #include "d_player.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "r_data/matrix.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/shaders/gl_shaderprogram.cpp

@@ -27,7 +27,7 @@
 
 #include "gl/system/gl_system.h"
 #include "v_video.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/shaders/gl_shaderprogram.h"

src/gl/system/gl_debug.h

@@ -2,7 +2,7 @@
 #define __GL_DEBUG_H
 
 #include <string.h>
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "c_cvars.h"
 #include "r_defs.h"
 #include "v_video.h"

src/gl/system/gl_framebuffer.cpp

@@ -31,7 +31,7 @@
 #include "m_png.h"
 #include "templates.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"

src/gl/system/gl_wipe.cpp

@@ -31,7 +31,7 @@
 #include "v_palette.h"
 #include "templates.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderbuffers.h"

src/gl/textures/gl_hwtexture.cpp

@@ -32,7 +32,7 @@
 #include "r_data/colormaps.h"
 #include "hwrenderer/textures/hw_material.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/textures/gl_hwtexture.h

@@ -10,7 +10,7 @@
 #define DIRECT_PALETTE -2
 
 #include "tarray.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/textures/hw_ihwtexture.h"
 
 class FCanvasTexture;

src/gl/textures/gl_samplers.cpp

@@ -23,7 +23,7 @@
 #include "gl/system/gl_system.h"
 #include "c_cvars.h"
 
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"

src/gl_load/gl_interface.cpp

@@ -32,7 +32,7 @@
 #include "m_argv.h"
 #include "version.h"
 #include "v_video.h"
-#include "gl/system/gl_interface.h"
+#include "gl_load/gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 
 void gl_PatchMenu();