- moved lightbuffers and flatvertices to 'common'.

src/CMakeLists.txt

@@ -957,10 +957,8 @@ set (PCH_SOURCES
 	rendering/gl/textures/gl_samplers.cpp
 	rendering/hwrenderer/hw_entrypoint.cpp
 	rendering/hwrenderer/data/hw_vertexbuilder.cpp
-	rendering/hwrenderer/data/flatvertices.cpp
 	rendering/hwrenderer/dynlights/hw_aabbtree.cpp
 	rendering/hwrenderer/dynlights/hw_shadowmap.cpp
-	rendering/hwrenderer/dynlights/hw_lightbuffer.cpp
 	rendering/hwrenderer/models/hw_models.cpp
 	rendering/hwrenderer/scene/hw_skydome.cpp
 	rendering/hwrenderer/scene/hw_drawlistadd.cpp
@@ -1142,9 +1140,11 @@ set (PCH_SOURCES
 	common/objects/dobjgc.cpp
 	common/objects/dobjtype.cpp
 	common/rendering/r_videoscale.cpp
+	common/rendering/hwrenderer/data/flatvertices.cpp
 	common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
 	common/rendering/hwrenderer/data/hw_cvars.cpp
 	common/rendering/hwrenderer/data/hw_vrmodes.cpp
+	common/rendering/hwrenderer/data/hw_lightbuffer.cpp
 	common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
 	common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp
 	common/rendering/gl_load/gl_interface.cpp

src/common/rendering/hwrenderer/data/hw_lightbuffer.cpp

@@ -26,9 +26,8 @@
 **/
 
 #include "hw_lightbuffer.h"
-#include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
-#include "hwrenderer/data/shaderuniforms.h"
+#include "hw_dynlightdata.h"
+#include "shaderuniforms.h"
 
 static const int ELEMENTS_PER_LIGHT = 4;			// each light needs 4 vec4's.
 static const int ELEMENT_SIZE = (4*sizeof(float));

src/common/rendering/hwrenderer/data/hw_lightbuffer.h

@@ -2,7 +2,7 @@
 #define __GL_LIGHTBUFFER_H
 
 #include "tarray.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hwrenderer/data/buffers.h"
 #include <atomic>
 #include <mutex>

src/maploader/maploader.cpp

@@ -77,7 +77,7 @@
 #include "m_argv.h"
 #include "fragglescript/t_fs.h"
 #include "swrenderer/r_swrenderer.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "xlat/xlat.h"
 #include "vm.h"
 #include "texturemanager.h"

src/rendering/gl/renderer/gl_postprocess.cpp

@@ -30,7 +30,7 @@
 #include "gl/shaders/gl_shaderprogram.h"
 #include "hwrenderer/postprocessing/hw_postprocess.h"
 #include "hwrenderer/postprocessing/hw_postprocess_cvars.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "r_videoscale.h"
 #include "v_video.h"
 #include "templates.h"

src/rendering/gl/renderer/gl_renderer.cpp

@@ -49,11 +49,11 @@
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/shaders/gl_shaderprogram.h"
 #include "hw_vrmodes.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "gl/textures/gl_samplers.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "r_videoscale.h"
 #include "r_data/models/models.h"

src/rendering/gl/renderer/gl_renderstate.cpp

@@ -31,11 +31,11 @@
 #include "gl_system.h"
 #include "gl_interface.h"
 #include "hw_cvars.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/scene/hw_skydome.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/renderer/gl_renderer.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/textures/gl_hwtexture.h"
 #include "gl/system/gl_buffers.h"

src/rendering/gl/shaders/gl_shader.cpp

@@ -38,7 +38,7 @@
 #include "hwrenderer/utility/hw_shaderpatcher.h"
 #include "hwrenderer/data/shaderuniforms.h"
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 
 #include "gl_interface.h"
 #include "gl/system/gl_debug.h"

src/rendering/gl/system/gl_framebuffer.cpp

@@ -43,14 +43,14 @@
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "gl/shaders/gl_shaderprogram.h"
 #include "gl_debug.h"
 #include "r_videoscale.h"
 #include "gl_buffers.h"
 #include "swrenderer/r_swscene.h"
 
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 
 EXTERN_CVAR (Bool, vid_vsync)
 EXTERN_CVAR(Bool, r_drawvoxels)

src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp

@@ -22,7 +22,7 @@
 
 #include "hwrenderer/dynlights/hw_shadowmap.h"
 #include "hw_cvars.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hwrenderer/data/buffers.h"
 #include "hwrenderer/data/shaderuniforms.h"
 #include "stats.h"

src/rendering/hwrenderer/hw_entrypoint.cpp

@@ -36,11 +36,11 @@
 #include "i_time.h"
 #include "swrenderer/r_swscene.h"
 #include "swrenderer/r_renderer.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "hw_cvars.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/scene/hw_fakeflat.h"

src/rendering/hwrenderer/models/hw_models.cpp

@@ -37,7 +37,7 @@
 #include "cmdlib.h"
 #include "hw_material.h"
 #include "hwrenderer/data/buffers.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hw_renderstate.h"
 #include "hwrenderer/scene/hw_portal.h"

src/rendering/hwrenderer/scene/hw_bsp.cpp

@@ -40,7 +40,7 @@
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_portal.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/data/hw_vertexbuilder.h"
 
 #ifdef ARCH_IA32

src/rendering/hwrenderer/scene/hw_decal.cpp

@@ -35,7 +35,7 @@
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hw_renderstate.h"
 #include "texturemanager.h"
 

src/rendering/hwrenderer/scene/hw_drawinfo.cpp

@@ -39,8 +39,8 @@
 #include "hwrenderer/utility/hw_clock.h"
 #include "hw_cvars.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
-#include "hwrenderer/data/flatvertices.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "flatvertices.h"
+#include "hw_lightbuffer.h"
 #include "hw_vrmodes.h"
 #include "hw_clipper.h"
 

src/rendering/hwrenderer/scene/hw_drawlist.cpp

@@ -32,7 +32,7 @@
 #include "g_levellocals.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawlist.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hw_renderstate.h"
 #include "hw_drawinfo.h"

src/rendering/hwrenderer/scene/hw_drawlistadd.cpp

@@ -20,9 +20,9 @@
 //--------------------------------------------------------------------------
 //
 
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hw_cvars.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hw_material.h"

src/rendering/hwrenderer/scene/hw_flats.cpp

@@ -36,14 +36,14 @@
 #include "actorinlines.h"
 #include "p_lnspec.h"
 #include "matrix.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hw_material.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
-#include "hwrenderer/data/flatvertices.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "flatvertices.h"
+#include "hw_lightbuffer.h"
 #include "hw_drawstructs.h"
 #include "hw_renderstate.h"
 #include "texturemanager.h"

src/rendering/hwrenderer/scene/hw_portal.cpp

@@ -33,7 +33,7 @@
 #include "r_sky.h"
 #include "g_levellocals.h"
 #include "hw_renderstate.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "texturemanager.h"

src/rendering/hwrenderer/scene/hw_renderhacks.cpp

@@ -36,9 +36,9 @@
 #include "hw_drawinfo.h"
 #include "hw_drawstructs.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
-#include "hwrenderer/data/flatvertices.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_dynlightdata.h"
+#include "flatvertices.h"
+#include "hw_lightbuffer.h"
 #include "hwrenderer/scene/hw_portal.h"
 #include "hw_fakeflat.h"
 

src/rendering/hwrenderer/scene/hw_spritelight.cpp

@@ -32,7 +32,7 @@
 #include "g_level.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hwrenderer/dynlights/hw_shadowmap.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"

src/rendering/hwrenderer/scene/hw_sprites.cpp

@@ -49,13 +49,13 @@
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/scene/hw_portal.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hw_material.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_dynlightdata.h"
+#include "hw_lightbuffer.h"
 #include "hw_renderstate.h"
 
 extern TArray<spritedef_t> sprites;

src/rendering/hwrenderer/scene/hw_walls.cpp

@@ -32,7 +32,7 @@
 #include "g_levellocals.h"
 #include "actorinlines.h"
 #include "texturemanager.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hw_material.h"
 #include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
@@ -40,7 +40,7 @@
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_portal.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "hw_renderstate.h"
 #include "hw_skydome.h"
 

src/rendering/hwrenderer/scene/hw_walls_vertex.cpp

@@ -22,7 +22,7 @@
 
 
 #include "r_defs.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 

src/rendering/hwrenderer/scene/hw_weapon.cpp

@@ -37,14 +37,14 @@
 #include "texturemanager.h"
 
 #include "hwrenderer/models/hw_models.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
+#include "hw_dynlightdata.h"
 #include "hw_material.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hw_cvars.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
-#include "hwrenderer/data/flatvertices.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "flatvertices.h"
+#include "hw_lightbuffer.h"
 #include "hw_renderstate.h"
 
 EXTERN_CVAR(Float, transsouls)

src/rendering/hwrenderer/utility/hw_draw2d.cpp

@@ -30,7 +30,7 @@
 #include "cmdlib.h"
 #include "r_defs.h"
 #include "hwrenderer/data/buffers.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hw_cvars.h"

src/rendering/polyrenderer/backend/poly_framebuffer.cpp

@@ -38,9 +38,9 @@
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_portal.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/data/shaderuniforms.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "hwrenderer/postprocessing/hw_postprocess.h"
 
 #include "swrenderer/r_swscene.h"

src/rendering/polyrenderer/backend/poly_renderstate.cpp

@@ -28,10 +28,10 @@
 #include "r_data/colormaps.h"
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/data/shaderuniforms.h"
 #include "swrenderer/r_swcolormaps.h"

src/rendering/v_framebuffer.cpp

@@ -50,7 +50,7 @@
 #include "i_time.h"
 #include "hwrenderer/scene/hw_portal.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "swrenderer/r_swscene.h"
 
 #include <chrono>

src/rendering/vulkan/renderer/vk_postprocess.cpp

@@ -33,7 +33,7 @@
 #include "hwrenderer/postprocessing/hw_postprocess.h"
 #include "hwrenderer/postprocessing/hw_postprocess_cvars.h"
 #include "hw_vrmodes.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "r_videoscale.h"
 #include "filesystem.h"
 

src/rendering/vulkan/renderer/vk_renderpass.cpp

@@ -28,7 +28,7 @@
 #include "vulkan/system/vk_builders.h"
 #include "vulkan/system/vk_framebuffer.h"
 #include "vulkan/system/vk_buffers.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
 #include "v_2ddrawer.h"
 

src/rendering/vulkan/renderer/vk_renderstate.cpp

@@ -31,10 +31,10 @@
 #include "r_data/colormaps.h"
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 #include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/data/shaderuniforms.h"
 

src/rendering/vulkan/system/vk_framebuffer.cpp

@@ -40,9 +40,9 @@
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_portal.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
-#include "hwrenderer/data/flatvertices.h"
+#include "flatvertices.h"
 #include "hwrenderer/data/shaderuniforms.h"
-#include "hwrenderer/dynlights/hw_lightbuffer.h"
+#include "hw_lightbuffer.h"
 
 #include "swrenderer/r_swscene.h"