diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23cdb04bd5..93ef236786 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp index 9f9fbf2840..d4bb5ee645 100644 --- a/src/gl/compatibility/gl_20.cpp +++ b/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" diff --git a/src/gl/data/gl_vertexbuffer.cpp b/src/gl/data/gl_vertexbuffer.cpp index 63dceb7626..532c04a062 100644 --- a/src/gl/data/gl_vertexbuffer.cpp +++ b/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" diff --git a/src/gl/data/gl_vertexbuffer.h b/src/gl/data/gl_vertexbuffer.h index 730f26e98e..28fe8f45ce 100644 --- a/src/gl/data/gl_vertexbuffer.h +++ b/src/gl/data/gl_vertexbuffer.h @@ -28,7 +28,7 @@ #include #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" diff --git a/src/gl/models/gl_models.cpp b/src/gl/models/gl_models.cpp index 454b31d4c5..74f3b4ac55 100644 --- a/src/gl/models/gl_models.cpp +++ b/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" diff --git a/src/gl/renderer/gl_lightdata.cpp b/src/gl/renderer/gl_lightdata.cpp index 345fc4c0f6..e27aa1c5e6 100644 --- a/src/gl/renderer/gl_lightdata.cpp +++ b/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" diff --git a/src/gl/renderer/gl_postprocessstate.cpp b/src/gl/renderer/gl_postprocessstate.cpp index 8363183852..85a34368e3 100644 --- a/src/gl/renderer/gl_postprocessstate.cpp +++ b/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" diff --git a/src/gl/renderer/gl_postprocessstate.h b/src/gl/renderer/gl_postprocessstate.h index 8e8b24b610..6f2b39a033 100644 --- a/src/gl/renderer/gl_postprocessstate.h +++ b/src/gl/renderer/gl_postprocessstate.h @@ -2,7 +2,7 @@ #define __GL_POSTPROCESSSTATE_H #include -#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" diff --git a/src/gl/renderer/gl_renderbuffers.cpp b/src/gl/renderer/gl_renderbuffers.cpp index 30ce0e04b0..7b03f15496 100644 --- a/src/gl/renderer/gl_renderbuffers.cpp +++ b/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" diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp index b04ba5e79d..76ef8f78ef 100644 --- a/src/gl/renderer/gl_renderer.cpp +++ b/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" diff --git a/src/gl/renderer/gl_renderstate.cpp b/src/gl/renderer/gl_renderstate.cpp index 995c9f2c24..4035f6ddb1 100644 --- a/src/gl/renderer/gl_renderstate.cpp +++ b/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" diff --git a/src/gl/renderer/gl_renderstate.h b/src/gl/renderer/gl_renderstate.h index 0903362352..1db6602a57 100644 --- a/src/gl/renderer/gl_renderstate.h +++ b/src/gl/renderer/gl_renderstate.h @@ -24,7 +24,7 @@ #define __GL_RENDERSTATE_H #include -#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" diff --git a/src/gl/scene/gl_flats.cpp b/src/gl/scene/gl_flats.cpp index 361b920e9e..c1638262e3 100644 --- a/src/gl/scene/gl_flats.cpp +++ b/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" diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp index 4556f75e5b..2dbca45eff 100644 --- a/src/gl/scene/gl_portal.cpp +++ b/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" diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index 823da8b33c..20de39f778 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/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" diff --git a/src/gl/scene/gl_skydome.cpp b/src/gl/scene/gl_skydome.cpp index 5a60d940f6..c88e1e2f2a 100644 --- a/src/gl/scene/gl_skydome.cpp +++ b/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" diff --git a/src/gl/scene/gl_sprite.cpp b/src/gl/scene/gl_sprite.cpp index a05020373c..4bcad49fc2 100644 --- a/src/gl/scene/gl_sprite.cpp +++ b/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" diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp index bd6087468a..20a7542e26 100644 --- a/src/gl/scene/gl_walls_draw.cpp +++ b/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" diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp index 712bf52dc7..60f6fda599 100644 --- a/src/gl/scene/gl_weapon.cpp +++ b/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" diff --git a/src/gl/shaders/gl_postprocessshader.cpp b/src/gl/shaders/gl_postprocessshader.cpp index a1b50f24fc..12fa711465 100644 --- a/src/gl/shaders/gl_postprocessshader.cpp +++ b/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" diff --git a/src/gl/shaders/gl_shader.cpp b/src/gl/shaders/gl_shader.cpp index ea8003d0ad..49803da007 100644 --- a/src/gl/shaders/gl_shader.cpp +++ b/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" diff --git a/src/gl/shaders/gl_shaderprogram.cpp b/src/gl/shaders/gl_shaderprogram.cpp index 5c173daa26..3014515f3e 100644 --- a/src/gl/shaders/gl_shaderprogram.cpp +++ b/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" diff --git a/src/gl/system/gl_debug.h b/src/gl/system/gl_debug.h index 4f67eec68e..191e027f50 100644 --- a/src/gl/system/gl_debug.h +++ b/src/gl/system/gl_debug.h @@ -2,7 +2,7 @@ #define __GL_DEBUG_H #include -#include "gl/system/gl_interface.h" +#include "gl_load/gl_interface.h" #include "c_cvars.h" #include "r_defs.h" #include "v_video.h" diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp index ed2b3fdc61..0d0bbf58ce 100644 --- a/src/gl/system/gl_framebuffer.cpp +++ b/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" diff --git a/src/gl/system/gl_wipe.cpp b/src/gl/system/gl_wipe.cpp index 3c8ca35235..ea67b9b857 100644 --- a/src/gl/system/gl_wipe.cpp +++ b/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" diff --git a/src/gl/textures/gl_hwtexture.cpp b/src/gl/textures/gl_hwtexture.cpp index 0a729813ba..bad5ef69c8 100644 --- a/src/gl/textures/gl_hwtexture.cpp +++ b/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" diff --git a/src/gl/textures/gl_hwtexture.h b/src/gl/textures/gl_hwtexture.h index 87facf5e77..ae9a227837 100644 --- a/src/gl/textures/gl_hwtexture.h +++ b/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; diff --git a/src/gl/textures/gl_samplers.cpp b/src/gl/textures/gl_samplers.cpp index a3ecc6b4d4..ab29e7adff 100644 --- a/src/gl/textures/gl_samplers.cpp +++ b/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" diff --git a/src/gl/system/gl_interface.cpp b/src/gl_load/gl_interface.cpp similarity index 99% rename from src/gl/system/gl_interface.cpp rename to src/gl_load/gl_interface.cpp index 5f9cf2441e..3bc752c6bb 100644 --- a/src/gl/system/gl_interface.cpp +++ b/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(); diff --git a/src/gl/system/gl_interface.h b/src/gl_load/gl_interface.h similarity index 100% rename from src/gl/system/gl_interface.h rename to src/gl_load/gl_interface.h