- moved gl_load to 'common'.

# Conflicts:
#	source/CMakeLists.txt
#	source/common/rendering/gl_load/gl_interface.cpp

source/CMakeLists.txt

@@ -595,7 +595,6 @@ file( GLOB HEADER_FILES
 	core/menu/*.h
 	core/input/*.h
 	core/rendering/*.h
-	core/rendering/gl_load/*.h
 	core/rendering/gl/system/*.h
 	core/rendering/gl/renderer/*.h
 	core/rendering/gl/shaders/*.h
@@ -615,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
@@ -659,6 +659,7 @@ set( VM_JIT_SOURCES
 # Enable fast math for some sources where performance matters (or where the PCH must not be used.) (This would be good for rendering code, but unfortunately that is hopelessly intermingled with the playsim code in engine.cpp.)
 set( FASTMATH_SOURCES
 
+	common/rendering/gl_load/gl_load.c
 	# This should better be made a library subproject later, once things are working.
 	libsmackerdec/src/BitReader.cpp
 	libsmackerdec/src/FileStream.cpp
@@ -669,7 +670,6 @@ set( FASTMATH_SOURCES
 	common/utility/matrix.cpp
 
 	# The rest is only here because it is C, not C++
-	core/rendering/gl_load/gl_load.c
 
 	gitinfo.cpp
 )
@@ -820,6 +820,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
@@ -872,7 +873,6 @@ set (PCH_SOURCES
 	core/rendering/gl/system/gl_buffers.cpp
 	core/rendering/gl/system/gl_debug.cpp
 	core/rendering/gl/system/gl_framebuffer.cpp
-	core/rendering/gl_load/gl_interface.cpp
 	core/rendering/hwrenderer/data/flatvertices.cpp
 	core/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
 	core/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp
@@ -968,7 +968,6 @@ include_directories(
 	core/dobject
 	core/menu
 	core/input
-	core/rendering/gl_load
 	core/rendering/gl/system
 	core/rendering/gl/renderer
 	core/rendering/gl/shaders
@@ -987,6 +986,8 @@ include_directories(
 	common/console
 	common/engine
 	common/objects
+	common/rendering
+	common/rendering/gl_load
 	common/scripting/vm
 	common/scripting/jit
 	common/scripting/core
@@ -1092,7 +1093,6 @@ source_group("Core\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core
 source_group("Core\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/dobject/.+")
 source_group("Core\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/menu/.+")
 source_group("Core\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/.+")
-source_group("Core\\Rendering\\GL_Load" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/gl_load/.+")
 source_group("Core\\Rendering\\GL\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/gl/system.+")
 source_group("Platform" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/.+")
 source_group("Platform\\Win32" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/win32/.+")
@@ -1115,6 +1115,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\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/formats.+")
 source_group("Common\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/.+")

source/common/rendering/gl_load/gl_interface.cpp

@@ -32,14 +32,14 @@
 **
 */
 
-#include "gl_load/gl_system.h"
+#include "gl_system.h"
 #include "tarray.h"
 #include "basics.h"
 #include "m_argv.h"
 #include "version.h"
 #include "v_video.h"
 #include "printf.h"
-#include "gl_load/gl_interface.h"
+#include "gl_interface.h"
 #include "gamecvars.h"
 
 static TArray<FString>  m_Extensions;