- moved gl_load to common.

src/CMakeLists.txt

@@ -614,6 +614,7 @@ file( GLOB HEADER_FILES
 	common/thirdparty/*.h
 	common/thirdparty/rapidjson/*.h
 	common/thirdparty/math/*h
+	common/rendering/gl_load/*.h
 	common/scripting/core/*h
 	common/scripting/vm/*h
 	common/scripting/jit/*h
@@ -660,7 +661,6 @@ file( GLOB HEADER_FILES
 	rendering/gl/shaders/*.h
 	rendering/gl/system/*.h
 	rendering/gl/textures/*.h
-	rendering/gl_load/*.h
 	*.h
 )
 
@@ -764,7 +764,7 @@ set( FASTMATH_SOURCES
 	common/textures/hires/hqnx/hq4x.cpp
 	common/textures/hires/xbr/xbrz.cpp
 	common/textures/hires/xbr/xbrz_old.cpp
-	rendering/gl_load/gl_load.c
+	common/rendering/gl_load/gl_load.c
 	rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp
 	rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp
 	rendering/hwrenderer/dynlights/hw_dynlightdata.cpp
@@ -949,7 +949,6 @@ set (PCH_SOURCES
 	rendering/gl/renderer/gl_scene.cpp
 	rendering/gl/shaders/gl_shader.cpp
 	rendering/gl/shaders/gl_shaderprogram.cpp
-	rendering/gl_load/gl_interface.cpp
 	rendering/gl/system/gl_framebuffer.cpp
 	rendering/gl/system/gl_debug.cpp
 	rendering/gl/system/gl_buffers.cpp
@@ -1144,6 +1143,7 @@ set (PCH_SOURCES
 	common/objects/dobject.cpp
 	common/objects/dobjgc.cpp
 	common/objects/dobjtype.cpp
+	common/rendering/gl_load/gl_interface.cpp
 	common/scripting/core/dictionary.cpp
 	common/scripting/core/dynarrays.cpp
 	common/scripting/core/symbols.cpp
@@ -1249,6 +1249,8 @@ include_directories( .
 	common/engine
 	common/fonts
 	common/objects
+	common/rendering
+	common/rendering/gl_load
 	common/scripting/vm
 	common/scripting/jit
 	common/scripting/core
@@ -1407,7 +1409,6 @@ source_group("Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE
 source_group("Rendering\\Vulkan Renderer\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/.+")
 source_group("Rendering\\Vulkan Renderer\\Third Party\\Volk" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/volk/.+")
 source_group("Rendering\\Vulkan Renderer\\Third Party\\Vk_Mem_Alloc" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/vk_mem_alloc.+")
-source_group("Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl_load/.+")
 source_group("Rendering\\OpenGL Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/.+")
 source_group("Rendering\\OpenGL Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/data/.+")
 source_group("Rendering\\OpenGL Renderer\\Dynamic Lights" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/dynlights/.+")
@@ -1461,6 +1462,8 @@ source_group("Common\\Scripting\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_S
 source_group("Common\\Scripting\\Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/core/.+")
 source_group("Common\\Scripting\\JIT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/jit/.+")
 source_group("Common\\Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/vm/.+")
+source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/.+")
+source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl_load/.+")
 source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+")
 source_group("Common\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/.+")
 source_group("Common\\Textures\\Hires\\HQ Resize" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/hqnx/.+")

src/common/rendering/gl_load/gl_interface.cpp

@@ -32,7 +32,7 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "engineerrors.h"
 #include "tarray.h"
 #include "basics.h"
@@ -40,7 +40,7 @@
 #include "version.h"
 #include "v_video.h"
 #include "printf.h"
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 
 static TArray<FString>  m_Extensions;
 RenderContext gl;

src/d_anonstats.cpp

@@ -34,7 +34,7 @@ extern int sys_ostype;
 #include "x86.h"
 #include "version.h"
 #include "v_video.h"
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 
 CVAR(Int, sys_statsenabled, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOSET)
 CVAR(String, sys_statshost, "gzstats.drdteam.org", CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOSET)

src/posix/cocoa/i_video.mm

@@ -31,7 +31,7 @@
  **
  */
 
-#include "gl_load/gl_load.h"
+#include "gl_load.h"
 
 #ifdef HAVE_VULKAN
 #define VK_USE_PLATFORM_MACOS_MVK

src/posix/sdl/sdlglvideo.cpp

@@ -47,7 +47,7 @@
 
 #include "hardware.h"
 #include "gl_sysfb.h"
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "r_defs.h"
 
 #include "gl/renderer/gl_renderer.h"

src/rendering/gl/renderer/gl_postprocess.cpp

@@ -19,7 +19,7 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "gi.h"
 #include "m_png.h"
 #include "r_utility.h"

src/rendering/gl/renderer/gl_postprocessstate.cpp

@@ -20,8 +20,8 @@
 */
 
 #include "templates.h"
-#include "gl_load/gl_system.h"
-#include "gl_load/gl_interface.h"
+#include "gl_system.h"
+#include "gl_interface.h"
 #include "gl/renderer/gl_postprocessstate.h"
 
 namespace OpenGLRenderer

src/rendering/gl/renderer/gl_postprocessstate.h

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

src/rendering/gl/renderer/gl_renderbuffers.cpp

@@ -19,9 +19,9 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "v_video.h"
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"

src/rendering/gl/renderer/gl_renderer.cpp

@@ -25,7 +25,7 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "files.h"
 #include "v_video.h"
 #include "m_png.h"
@@ -40,7 +40,7 @@
 #include "swrenderer/r_swscene.h"
 #include "hwrenderer/utility/hw_clock.h"
 
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"

src/rendering/gl/renderer/gl_renderstate.cpp

@@ -28,8 +28,8 @@
 #include "templates.h"
 #include "doomstat.h"
 #include "r_data/colormaps.h"
-#include "gl_load/gl_system.h"
-#include "gl_load/gl_interface.h"
+#include "gl_system.h"
+#include "gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/scene/hw_skydome.h"

src/rendering/gl/renderer/gl_renderstate.h

@@ -24,7 +24,7 @@
 #define __GL_RENDERSTATE_H
 
 #include <string.h>
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "matrix.h"
 #include "hwrenderer/scene//hw_drawstructs.h"
 #include "hwrenderer/scene//hw_renderstate.h"

src/rendering/gl/renderer/gl_scene.cpp

@@ -25,7 +25,7 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "gi.h"
 #include "m_png.h"
 #include "doomstat.h"
@@ -46,7 +46,7 @@
 #include "hwrenderer/data/flatvertices.h"
 
 #include "hwrenderer/dynlights/hw_lightbuffer.h"
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_debug.h"
 #include "hwrenderer/utility/hw_cvars.h"

src/rendering/gl/renderer/gl_stereo3d.cpp

@@ -25,7 +25,7 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "hwrenderer/utility/hw_vrmodes.h"

src/rendering/gl/shaders/gl_shader.cpp

@@ -26,7 +26,7 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "c_cvars.h"
 #include "v_video.h"
 #include "filesystem.h"
@@ -39,7 +39,7 @@
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
 #include "hwrenderer/dynlights/hw_lightbuffer.h"
 
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "matrix.h"
 #include "gl/renderer/gl_renderer.h"

src/rendering/gl/shaders/gl_shaderprogram.cpp

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

src/rendering/gl/shaders/gl_shaderprogram.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "gl_shader.h"
 #include "hwrenderer/postprocessing/hw_postprocess.h"
 

src/rendering/gl/system/gl_buffers.cpp

@@ -24,7 +24,7 @@
 **
 **/
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "gl_buffers.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "v_video.h"

src/rendering/gl/system/gl_debug.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "templates.h"
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "gl/system/gl_debug.h"
 #include "stats.h"
 #include <set>

src/rendering/gl/system/gl_debug.h

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

src/rendering/gl/system/gl_framebuffer.cpp

@@ -26,12 +26,12 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "v_video.h"
 #include "m_png.h"
 #include "templates.h"
 
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"

src/rendering/gl/textures/gl_hwtexture.cpp

@@ -26,14 +26,14 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "templates.h"
 #include "c_cvars.h"
 #include "doomtype.h"
 #include "r_data/colormaps.h"
 #include "hw_material.h"
 
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "hwrenderer/utility/hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"

src/rendering/gl/textures/gl_hwtexture.h

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

src/rendering/gl/textures/gl_samplers.cpp

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