Moved gl_dynlight to hwrenderer because it does not depend on any dir…

…ect renderer info.
ZDoom · Apr 16, 2018 · c1ce6c9 · c1ce6c9
1 parent 3e6f69f
commit c1ce6c9
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -856,9 +856,9 @@ set( FASTMATH_SOURCES
 	gl/scene/gl_walls_draw.cpp
 	gl/scene/gl_vertex.cpp
 	gl/scene/gl_spritelight.cpp
-	gl/dynlights/gl_dynlight1.cpp
 	gl_load/gl_load.c
 	gl/models/gl_models.cpp
+	hwrenderer/dynlights/hw_dynlightdata.cpp
 	r_data/models/models.cpp
 	r_data/matrix.cpp
 	sound/adlmidi/adldata.cpp

diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp
@@ -40,7 +40,8 @@
 #include "g_levellocals.h"
 #include "actorinlines.h"
 #include "g_levellocals.h"
-#include "gl/dynlights/gl_dynlight.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
+
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/system/gl_interface.h"

diff --git a/src/gl/compatibility/gl_swshader20.cpp b/src/gl/compatibility/gl_swshader20.cpp
@@ -34,7 +34,8 @@
 #include "i_system.h"
 #include "r_utility.h"
 #include "w_wad.h"
-#include "gl/dynlights/gl_dynlight.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
+
 #include "gl/renderer/gl_renderer.h"
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderstate.h"

diff --git a/src/gl/dynlights/gl_lightbuffer.cpp b/src/gl/dynlights/gl_lightbuffer.cpp
@@ -28,9 +28,9 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/dynlights/gl_lightbuffer.h"
-#include "gl/dynlights/gl_dynlight.h"
 #include "gl/system/gl_interface.h"
 #include "gl/utility//gl_clock.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 static const int INITIAL_BUFFER_SIZE = 160000;	// This means 80000 lights per frame and 160000*16 bytes == 2.56 MB.
 

diff --git a/src/gl/dynlights/gl_shadowmap.cpp b/src/gl/dynlights/gl_shadowmap.cpp
@@ -23,14 +23,14 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/dynlights/gl_shadowmap.h"
-#include "gl/dynlights/gl_dynlight.h"
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/shaders/gl_shadowmapshader.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
 #include "r_state.h"
 #include "g_levellocals.h"
 #include "stats.h"

diff --git a/src/gl/scene/gl_flats.cpp b/src/gl/scene/gl_flats.cpp
@@ -37,14 +37,14 @@
 #include "templates.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/dynlights/gl_dynlight.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/shaders/gl_shader.h"

diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp
@@ -45,6 +45,7 @@
 #include "serializer.h"
 #include "g_levellocals.h"
 #include "events.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/dynlights/gl_lightbuffer.h"
 #include "gl/system/gl_interface.h"
@@ -54,8 +55,6 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/dynlights/gl_dynlight.h"
-#include "gl/models/gl_models.h"
 #include "gl/scene/gl_clipper.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"

diff --git a/src/gl/scene/gl_spritelight.cpp b/src/gl/scene/gl_spritelight.cpp
@@ -33,11 +33,11 @@
 #include "g_level.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_lightdata.h"
-#include "gl/dynlights/gl_dynlight.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/shaders/gl_shader.h"

diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp
@@ -34,10 +34,10 @@
 #include "doomdata.h"
 #include "portal.h"
 #include "g_levellocals.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
-#include "gl/dynlights/gl_dynlight.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"

diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp
@@ -27,14 +27,14 @@
 #include "g_levellocals.h"
 #include "actor.h"
 #include "actorinlines.h"
+#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/dynlights/gl_dynlight.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"

diff --git a/src/gl/dynlights/gl_dynlight1.cpp → src/hwrenderer/dynlights/hw_dynlightdata.cpp b/src/gl/dynlights/gl_dynlight1.cpp → src/hwrenderer/dynlights/hw_dynlightdata.cpp
@@ -1,7 +1,7 @@
 // 
 //---------------------------------------------------------------------------
 //
-// Copyright(C) 2002-2016 Christoph Oelckers
+// Copyright(C) 2002-2018 Christoph Oelckers
 // All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 #include "actorinlines.h"
 #include "a_dynlight.h"
 
-#include "gl_dynlight.h"
+#include "hw_dynlightdata.h"
 
 
 //==========================================================================

diff --git a/src/gl/dynlights/gl_dynlight.h → src/hwrenderer/dynlights/hw_dynlightdata.h b/src/gl/dynlights/gl_dynlight.h → src/hwrenderer/dynlights/hw_dynlightdata.h