- moved around a few more files.

src/CMakeLists.txt

@@ -617,7 +617,9 @@ file( GLOB HEADER_FILES
 	common/thirdparty/*.h
 	common/thirdparty/rapidjson/*.h
 	common/thirdparty/math/*h
+	common/rendering/*.h
 	common/rendering/gl_load/*.h
+	common/rendering/hwrenderer/data/*.h
 	common/scripting/core/*h
 	common/scripting/vm/*h
 	common/scripting/jit/*h
@@ -1257,6 +1259,7 @@ include_directories( .
 	common/fonts
 	common/objects
 	common/rendering
+	common/rendering/hwrenderer/data
 	common/rendering/gl_load
 	common/scripting/vm
 	common/scripting/jit
@@ -1473,6 +1476,8 @@ source_group("Common\\Platforms\\Unix Files" REGULAR_EXPRESSION "^${CMAKE_CURREN
 source_group("Common\\Platforms\\SDL Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/posix/sdl/.+")
 source_group("Common\\Platforms\\Win32 Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/win32/.+")
 source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/.+")
+source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/.+")
+source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+")
 source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/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/.+")

src/common/rendering/r_videoscale.cpp

@@ -39,6 +39,7 @@
 #include "cmdlib.h"
 #include "v_draw.h"
 #include "i_interface.h"
+#include "printf.h"
 
 #define NUMSCALEMODES countof(vScaleTable)
 extern bool setsizeneeded;

src/r_data/v_palette.cpp

@@ -49,6 +49,7 @@
 #include "x86.h"
 #include "g_levellocals.h"
 #include "m_png.h"
+#include "v_colortables.h"
 
 /* Current color blending values */
 int		BlendR, BlendG, BlendB, BlendA;

src/rendering/hwrenderer/data/hw_viewpointbuffer.cpp

@@ -27,7 +27,6 @@
 
 #include "hwrenderer/data/shaderuniforms.h"
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
-#include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_renderstate.h"
 #include "hw_viewpointbuffer.h"
 

src/rendering/v_video.h

@@ -35,15 +35,11 @@
 #define __V_VIDEO_H__
 
 #include <functional>
-#include "doomtype.h"
 #include "vectors.h"
 
-#include "doomdef.h"
 #include "m_png.h"
-#include "dobject.h"
 #include "renderstyle.h"
 #include "c_cvars.h"
-#include "v_colortables.h"
 #include "v_2ddrawer.h"
 
 #include "hwrenderer/dynlights/hw_shadowmap.h"