From c5b3b9e107ccade06c8f1199e5aa6cbea3b3e437 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 28 Oct 2018 13:26:47 +0100 Subject: [PATCH] - moved the viewpoint buffer to hwrenderer. --- src/CMakeLists.txt | 3 +-- src/gl/renderer/gl_renderer.cpp | 2 +- src/gl/scene/gl_drawinfo.cpp | 2 +- src/gl/scene/gl_scene.cpp | 2 +- .../data/hw_viewpointbuffer.cpp} | 4 +--- .../data/hw_viewpointbuffer.h} | 0 6 files changed, 5 insertions(+), 8 deletions(-) rename src/{gl/data/gl_viewpointbuffer.cpp => hwrenderer/data/hw_viewpointbuffer.cpp} (96%) rename src/{gl/data/gl_viewpointbuffer.h => hwrenderer/data/hw_viewpointbuffer.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f17340bae..7480ee67c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -700,7 +700,6 @@ file( GLOB HEADER_FILES hwrenderer/textures/*.h hwrenderer/utility/*.h gl/*.h - gl/data/*.h gl/dynlights/*.h gl/models/*.h gl/renderer/*.h @@ -1038,7 +1037,6 @@ set (PCH_SOURCES g_statusbar/sbarinfo.cpp g_statusbar/sbar_mugshot.cpp g_statusbar/shared_sbar.cpp - gl/data/gl_viewpointbuffer.cpp gl/dynlights/gl_lightbuffer.cpp gl/dynlights/gl_shadowmap.cpp gl/renderer/gl_renderer.cpp @@ -1057,6 +1055,7 @@ set (PCH_SOURCES gl/textures/gl_hwtexture.cpp gl/textures/gl_samplers.cpp hwrenderer/data/flatvertices.cpp + hwrenderer/data/hw_viewpointbuffer.cpp hwrenderer/dynlights/hw_aabbtree.cpp hwrenderer/dynlights/hw_shadowmap.cpp hwrenderer/models/hw_models.cpp diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp index 4dfd98c47..3c24f6cc8 100644 --- a/src/gl/renderer/gl_renderer.cpp +++ b/src/gl/renderer/gl_renderer.cpp @@ -57,7 +57,7 @@ #include "gl/shaders/gl_postprocessshaderinstance.h" #include "gl/textures/gl_samplers.h" #include "gl/dynlights/gl_lightbuffer.h" -#include "gl/data/gl_viewpointbuffer.h" +#include "hwrenderer/data/hw_viewpointbuffer.h" #include "r_videoscale.h" #include "r_data/models/models.h" diff --git a/src/gl/scene/gl_drawinfo.cpp b/src/gl/scene/gl_drawinfo.cpp index 7cf1f24ec..cb7e73723 100644 --- a/src/gl/scene/gl_drawinfo.cpp +++ b/src/gl/scene/gl_drawinfo.cpp @@ -41,7 +41,7 @@ #include "hwrenderer/scene/hw_clipper.h" #include "gl/renderer/gl_renderstate.h" #include "gl/renderer/gl_renderer.h" -#include "gl/data/gl_viewpointbuffer.h" +#include "hwrenderer/data/hw_viewpointbuffer.h" #include "gl/dynlights/gl_lightbuffer.h" #include "hwrenderer/models/hw_models.h" diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index dc2bcfde4..ddf003c42 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -51,7 +51,7 @@ #include "hwrenderer/utility/hw_cvars.h" #include "gl/renderer/gl_renderstate.h" #include "gl/renderer/gl_renderbuffers.h" -#include "gl/data/gl_viewpointbuffer.h" +#include "hwrenderer/data/hw_viewpointbuffer.h" #include "hwrenderer/scene/hw_clipper.h" #include "hwrenderer/scene/hw_portal.h" #include "gl/scene/gl_drawinfo.h" diff --git a/src/gl/data/gl_viewpointbuffer.cpp b/src/hwrenderer/data/hw_viewpointbuffer.cpp similarity index 96% rename from src/gl/data/gl_viewpointbuffer.cpp rename to src/hwrenderer/data/hw_viewpointbuffer.cpp index f109355d6..2ab426d23 100644 --- a/src/gl/data/gl_viewpointbuffer.cpp +++ b/src/hwrenderer/data/hw_viewpointbuffer.cpp @@ -25,12 +25,10 @@ ** **/ -#include "gl_load/gl_system.h" -#include "gl_load/gl_interface.h" #include "hwrenderer/data/shaderuniforms.h" #include "hwrenderer/scene/hw_viewpointuniforms.h" #include "hwrenderer/scene/hw_drawinfo.h" -#include "gl_viewpointbuffer.h" +#include "hw_viewpointbuffer.h" static const int INITIAL_BUFFER_SIZE = 100; // 100 viewpoints per frame should nearly always be enough diff --git a/src/gl/data/gl_viewpointbuffer.h b/src/hwrenderer/data/hw_viewpointbuffer.h similarity index 100% rename from src/gl/data/gl_viewpointbuffer.h rename to src/hwrenderer/data/hw_viewpointbuffer.h