diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a0e5df98..dc8201906 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/rendering/hwrenderer/data/flatvertices.cpp b/src/common/rendering/hwrenderer/data/flatvertices.cpp similarity index 100% rename from src/rendering/hwrenderer/data/flatvertices.cpp rename to src/common/rendering/hwrenderer/data/flatvertices.cpp diff --git a/src/rendering/hwrenderer/data/flatvertices.h b/src/common/rendering/hwrenderer/data/flatvertices.h similarity index 100% rename from src/rendering/hwrenderer/data/flatvertices.h rename to src/common/rendering/hwrenderer/data/flatvertices.h diff --git a/src/rendering/hwrenderer/dynlights/hw_dynlightdata.h b/src/common/rendering/hwrenderer/data/hw_dynlightdata.h similarity index 100% rename from src/rendering/hwrenderer/dynlights/hw_dynlightdata.h rename to src/common/rendering/hwrenderer/data/hw_dynlightdata.h diff --git a/src/rendering/hwrenderer/dynlights/hw_lightbuffer.cpp b/src/common/rendering/hwrenderer/data/hw_lightbuffer.cpp similarity index 96% rename from src/rendering/hwrenderer/dynlights/hw_lightbuffer.cpp rename to src/common/rendering/hwrenderer/data/hw_lightbuffer.cpp index 30326155f..2783ab669 100644 --- a/src/rendering/hwrenderer/dynlights/hw_lightbuffer.cpp +++ b/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)); diff --git a/src/rendering/hwrenderer/dynlights/hw_lightbuffer.h b/src/common/rendering/hwrenderer/data/hw_lightbuffer.h similarity index 94% rename from src/rendering/hwrenderer/dynlights/hw_lightbuffer.h rename to src/common/rendering/hwrenderer/data/hw_lightbuffer.h index aae08dbed..2e5849346 100644 --- a/src/rendering/hwrenderer/dynlights/hw_lightbuffer.h +++ b/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 #include diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp index 2fc70e559..050292e5d 100644 --- a/src/maploader/maploader.cpp +++ b/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" diff --git a/src/rendering/gl/renderer/gl_postprocess.cpp b/src/rendering/gl/renderer/gl_postprocess.cpp index b0dfe1c3e..b3400f219 100644 --- a/src/rendering/gl/renderer/gl_postprocess.cpp +++ b/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" diff --git a/src/rendering/gl/renderer/gl_renderer.cpp b/src/rendering/gl/renderer/gl_renderer.cpp index eaffe1d3c..ecaeebbc0 100644 --- a/src/rendering/gl/renderer/gl_renderer.cpp +++ b/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" diff --git a/src/rendering/gl/renderer/gl_renderstate.cpp b/src/rendering/gl/renderer/gl_renderstate.cpp index e59265020..34cc5ebff 100644 --- a/src/rendering/gl/renderer/gl_renderstate.cpp +++ b/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" diff --git a/src/rendering/gl/shaders/gl_shader.cpp b/src/rendering/gl/shaders/gl_shader.cpp index 5dac1332e..a9799638a 100644 --- a/src/rendering/gl/shaders/gl_shader.cpp +++ b/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" diff --git a/src/rendering/gl/system/gl_framebuffer.cpp b/src/rendering/gl/system/gl_framebuffer.cpp index 20b631938..ea90b2101 100644 --- a/src/rendering/gl/system/gl_framebuffer.cpp +++ b/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) diff --git a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp b/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp index d32d2d7a2..3bc9750f9 100644 --- a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/hw_entrypoint.cpp b/src/rendering/hwrenderer/hw_entrypoint.cpp index ea61d8230..adaccd971 100644 --- a/src/rendering/hwrenderer/hw_entrypoint.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/models/hw_models.cpp b/src/rendering/hwrenderer/models/hw_models.cpp index 015b8598b..8bf1ce55e 100644 --- a/src/rendering/hwrenderer/models/hw_models.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_bsp.cpp b/src/rendering/hwrenderer/scene/hw_bsp.cpp index f8e7c9687..5009f37ee 100644 --- a/src/rendering/hwrenderer/scene/hw_bsp.cpp +++ b/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 diff --git a/src/rendering/hwrenderer/scene/hw_decal.cpp b/src/rendering/hwrenderer/scene/hw_decal.cpp index 45596b151..6dc727731 100644 --- a/src/rendering/hwrenderer/scene/hw_decal.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index d8146664f..1335ffa8e 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_drawlist.cpp b/src/rendering/hwrenderer/scene/hw_drawlist.cpp index ae3a83e78..18e425c9f 100644 --- a/src/rendering/hwrenderer/scene/hw_drawlist.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp b/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp index e48326e11..a034276a4 100644 --- a/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_flats.cpp b/src/rendering/hwrenderer/scene/hw_flats.cpp index b2976527c..f051aaa4f 100644 --- a/src/rendering/hwrenderer/scene/hw_flats.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_portal.cpp b/src/rendering/hwrenderer/scene/hw_portal.cpp index 657159e7d..06ae4c7e3 100644 --- a/src/rendering/hwrenderer/scene/hw_portal.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_renderhacks.cpp b/src/rendering/hwrenderer/scene/hw_renderhacks.cpp index cc8a2af3e..383578410 100644 --- a/src/rendering/hwrenderer/scene/hw_renderhacks.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_spritelight.cpp b/src/rendering/hwrenderer/scene/hw_spritelight.cpp index b5019975f..292a970a6 100644 --- a/src/rendering/hwrenderer/scene/hw_spritelight.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp index 00ee37e9f..93e56cca3 100644 --- a/src/rendering/hwrenderer/scene/hw_sprites.cpp +++ b/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 sprites; diff --git a/src/rendering/hwrenderer/scene/hw_walls.cpp b/src/rendering/hwrenderer/scene/hw_walls.cpp index bc788fe1d..bdc848aef 100644 --- a/src/rendering/hwrenderer/scene/hw_walls.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_walls_vertex.cpp b/src/rendering/hwrenderer/scene/hw_walls_vertex.cpp index 81a258277..751dbde64 100644 --- a/src/rendering/hwrenderer/scene/hw_walls_vertex.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_weapon.cpp b/src/rendering/hwrenderer/scene/hw_weapon.cpp index debbf71bb..acca62c9a 100644 --- a/src/rendering/hwrenderer/scene/hw_weapon.cpp +++ b/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) diff --git a/src/rendering/hwrenderer/utility/hw_draw2d.cpp b/src/rendering/hwrenderer/utility/hw_draw2d.cpp index 2abc5397e..8d4df1696 100644 --- a/src/rendering/hwrenderer/utility/hw_draw2d.cpp +++ b/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" diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp index 3eb79890b..2398c818e 100644 --- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp +++ b/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" diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.cpp b/src/rendering/polyrenderer/backend/poly_renderstate.cpp index c114c9ac3..cd13c3c48 100644 --- a/src/rendering/polyrenderer/backend/poly_renderstate.cpp +++ b/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" diff --git a/src/rendering/v_framebuffer.cpp b/src/rendering/v_framebuffer.cpp index 470409c9a..bedab9d88 100644 --- a/src/rendering/v_framebuffer.cpp +++ b/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 diff --git a/src/rendering/vulkan/renderer/vk_postprocess.cpp b/src/rendering/vulkan/renderer/vk_postprocess.cpp index 1e85705a2..b2b7d1ae4 100644 --- a/src/rendering/vulkan/renderer/vk_postprocess.cpp +++ b/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" diff --git a/src/rendering/vulkan/renderer/vk_renderpass.cpp b/src/rendering/vulkan/renderer/vk_renderpass.cpp index 7567ee90f..24a3968aa 100644 --- a/src/rendering/vulkan/renderer/vk_renderpass.cpp +++ b/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" diff --git a/src/rendering/vulkan/renderer/vk_renderstate.cpp b/src/rendering/vulkan/renderer/vk_renderstate.cpp index 55484d894..52a458d18 100644 --- a/src/rendering/vulkan/renderer/vk_renderstate.cpp +++ b/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" diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/rendering/vulkan/system/vk_framebuffer.cpp index 9a96f87e9..7aca21c0e 100644 --- a/src/rendering/vulkan/system/vk_framebuffer.cpp +++ b/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"