From b2776c9351782d6592df93d94d7f74672fd9baa5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 28 Oct 2018 15:09:33 +0100 Subject: [PATCH] - moved lightbuffer files to hwrenderer. --- src/CMakeLists.txt | 2 +- src/gl/renderer/gl_renderer.cpp | 2 +- src/gl/renderer/gl_renderstate.cpp | 2 +- src/gl/scene/gl_drawinfo.cpp | 2 +- src/gl/scene/gl_scene.cpp | 2 +- src/gl/scene/gl_walls_draw.cpp | 2 +- src/gl/shaders/gl_shader.cpp | 2 +- .../dynlights/hw_lightbuffer.cpp} | 2 +- .../gl_lightbuffer.h => hwrenderer/dynlights/hw_lightbuffer.h} | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename src/{gl/dynlights/gl_lightbuffer.cpp => hwrenderer/dynlights/hw_lightbuffer.cpp} (99%) rename src/{gl/dynlights/gl_lightbuffer.h => hwrenderer/dynlights/hw_lightbuffer.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7480ee67c..e583676be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1037,7 +1037,6 @@ set (PCH_SOURCES g_statusbar/sbarinfo.cpp g_statusbar/sbar_mugshot.cpp g_statusbar/shared_sbar.cpp - gl/dynlights/gl_lightbuffer.cpp gl/dynlights/gl_shadowmap.cpp gl/renderer/gl_renderer.cpp gl/renderer/gl_renderstate.cpp @@ -1058,6 +1057,7 @@ set (PCH_SOURCES hwrenderer/data/hw_viewpointbuffer.cpp hwrenderer/dynlights/hw_aabbtree.cpp hwrenderer/dynlights/hw_shadowmap.cpp + hwrenderer/dynlights/hw_lightbuffer.cpp hwrenderer/models/hw_models.cpp hwrenderer/scene/hw_skydome.cpp hwrenderer/postprocessing/hw_postprocess.cpp diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp index 3ca99d104..a3f8134ef 100644 --- a/src/gl/renderer/gl_renderer.cpp +++ b/src/gl/renderer/gl_renderer.cpp @@ -56,7 +56,7 @@ #include "hwrenderer/scene/hw_skydome.h" #include "gl/shaders/gl_postprocessshaderinstance.h" #include "gl/textures/gl_samplers.h" -#include "gl/dynlights/gl_lightbuffer.h" +#include "hwrenderer/dynlights/hw_lightbuffer.h" #include "hwrenderer/data/hw_viewpointbuffer.h" #include "r_videoscale.h" #include "r_data/models/models.h" diff --git a/src/gl/renderer/gl_renderstate.cpp b/src/gl/renderer/gl_renderstate.cpp index 9df29b341..922c281cc 100644 --- a/src/gl/renderer/gl_renderstate.cpp +++ b/src/gl/renderer/gl_renderstate.cpp @@ -35,7 +35,7 @@ #include "hwrenderer/scene/hw_skydome.h" #include "gl/shaders/gl_shader.h" #include "gl/renderer/gl_renderer.h" -#include "gl/dynlights//gl_lightbuffer.h" +#include "hwrenderer/dynlights/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/gl/scene/gl_drawinfo.cpp b/src/gl/scene/gl_drawinfo.cpp index d6cb7f267..ae2d116e3 100644 --- a/src/gl/scene/gl_drawinfo.cpp +++ b/src/gl/scene/gl_drawinfo.cpp @@ -42,7 +42,7 @@ #include "gl/renderer/gl_renderstate.h" #include "gl/renderer/gl_renderer.h" #include "hwrenderer/data/hw_viewpointbuffer.h" -#include "gl/dynlights/gl_lightbuffer.h" +#include "hwrenderer/dynlights/hw_lightbuffer.h" #include "hwrenderer/models/hw_models.h" class FDrawInfoList diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index 4b2602f61..63151c9a4 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -44,7 +44,7 @@ #include "hwrenderer/utility/hw_clock.h" #include "hwrenderer/data/flatvertices.h" -#include "gl/dynlights/gl_lightbuffer.h" +#include "hwrenderer/dynlights/hw_lightbuffer.h" #include "gl_load/gl_interface.h" #include "gl/system/gl_framebuffer.h" #include "gl/system/gl_debug.h" diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp index 213acb83f..8901d9971 100644 --- a/src/gl/scene/gl_walls_draw.cpp +++ b/src/gl/scene/gl_walls_draw.cpp @@ -31,7 +31,7 @@ #include "gl_load/gl_interface.h" #include "hwrenderer/utility/hw_cvars.h" #include "gl/renderer/gl_renderer.h" -#include "gl/dynlights/gl_lightbuffer.h" +#include "hwrenderer/dynlights/hw_lightbuffer.h" #include "gl/scene/gl_drawinfo.h" EXTERN_CVAR(Bool, gl_seamless) diff --git a/src/gl/shaders/gl_shader.cpp b/src/gl/shaders/gl_shader.cpp index 62e1a190f..1a94c3ae6 100644 --- a/src/gl/shaders/gl_shader.cpp +++ b/src/gl/shaders/gl_shader.cpp @@ -35,13 +35,13 @@ #include "hwrenderer/utility/hw_shaderpatcher.h" #include "hwrenderer/data/shaderuniforms.h" #include "hwrenderer/scene/hw_viewpointuniforms.h" +#include "hwrenderer/dynlights/hw_lightbuffer.h" #include "gl_load/gl_interface.h" #include "gl/system/gl_debug.h" #include "r_data/matrix.h" #include "gl/renderer/gl_renderer.h" #include "gl/shaders/gl_shader.h" -#include "gl/dynlights/gl_lightbuffer.h" bool FShader::Load(const char * name, const char * vert_prog_lump, const char * frag_prog_lump, const char * proc_prog_lump, const char * light_fragprog, const char * defines) { diff --git a/src/gl/dynlights/gl_lightbuffer.cpp b/src/hwrenderer/dynlights/hw_lightbuffer.cpp similarity index 99% rename from src/gl/dynlights/gl_lightbuffer.cpp rename to src/hwrenderer/dynlights/hw_lightbuffer.cpp index adcc881e3..641015833 100644 --- a/src/gl/dynlights/gl_lightbuffer.cpp +++ b/src/hwrenderer/dynlights/hw_lightbuffer.cpp @@ -25,7 +25,7 @@ ** **/ -#include "gl/dynlights/gl_lightbuffer.h" +#include "hw_lightbuffer.h" #include "hwrenderer/utility/hw_clock.h" #include "hwrenderer/dynlights/hw_dynlightdata.h" #include "hwrenderer/data/shaderuniforms.h" diff --git a/src/gl/dynlights/gl_lightbuffer.h b/src/hwrenderer/dynlights/hw_lightbuffer.h similarity index 100% rename from src/gl/dynlights/gl_lightbuffer.h rename to src/hwrenderer/dynlights/hw_lightbuffer.h