From 401c9ab8ca7e31b86055e671c6cb6722ff0f66ac Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 16 May 2018 23:21:21 +0200 Subject: [PATCH] - 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 | 2 +- src/gl/compatibility/gl_20.cpp | 2 +- src/gl/data/gl_vertexbuffer.cpp | 2 +- src/gl/data/gl_vertexbuffer.h | 2 +- src/gl/models/gl_models.cpp | 2 +- src/gl/renderer/gl_lightdata.cpp | 2 +- src/gl/renderer/gl_postprocessstate.cpp | 2 +- src/gl/renderer/gl_postprocessstate.h | 2 +- src/gl/renderer/gl_renderbuffers.cpp | 2 +- src/gl/renderer/gl_renderer.cpp | 2 +- src/gl/renderer/gl_renderstate.cpp | 2 +- src/gl/renderer/gl_renderstate.h | 2 +- src/gl/scene/gl_flats.cpp | 2 +- src/gl/scene/gl_portal.cpp | 2 +- src/gl/scene/gl_scene.cpp | 2 +- src/gl/scene/gl_skydome.cpp | 2 +- src/gl/scene/gl_sprite.cpp | 2 +- src/gl/scene/gl_walls_draw.cpp | 2 +- src/gl/scene/gl_weapon.cpp | 2 +- src/gl/shaders/gl_postprocessshader.cpp | 2 +- src/gl/shaders/gl_shader.cpp | 2 +- src/gl/shaders/gl_shaderprogram.cpp | 2 +- src/gl/system/gl_debug.h | 2 +- src/gl/system/gl_framebuffer.cpp | 2 +- src/gl/system/gl_wipe.cpp | 2 +- src/gl/textures/gl_hwtexture.cpp | 2 +- src/gl/textures/gl_hwtexture.h | 2 +- src/gl/textures/gl_samplers.cpp | 2 +- src/{gl/system => gl_load}/gl_interface.cpp | 2 +- src/{gl/system => gl_load}/gl_interface.h | 0 30 files changed, 29 insertions(+), 29 deletions(-) rename src/{gl/system => gl_load}/gl_interface.cpp (99%) rename src/{gl/system => gl_load}/gl_interface.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23cdb04bd..93ef23678 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 9f9fbf284..d4bb5ee64 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 63dceb762..532c04a06 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 730f26e98..28fe8f45c 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 454b31d4c..74f3b4ac5 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 345fc4c0f..e27aa1c5e 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 836318385..85a34368e 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 8e8b24b61..6f2b39a03 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 30ce0e04b..7b03f1549 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 b04ba5e79..76ef8f78e 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 995c9f2c2..4035f6ddb 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 090336235..1db6602a5 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 361b920e9..c1638262e 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 4556f75e5..2dbca45ef 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 823da8b33..20de39f77 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 5a60d940f..c88e1e2f2 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 a05020373..4bcad49fc 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 bd6087468..20a7542e2 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 712bf52dc..60f6fda59 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 a1b50f24f..12fa71146 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 ea8003d0a..49803da00 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 5c173daa2..3014515f3 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 4f67eec68..191e027f5 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 ed2b3fdc6..0d0bbf58c 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 3c8ca3523..ea67b9b85 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 0a729813b..bad5ef69c 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 87facf5e7..ae9a22783 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 a3ecc6b4d..ab29e7adf 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 5f9cf2441..3bc752c6b 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