From c1ce6c90caca86a84a1feb11d5804be28e9bacc3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 16 Apr 2018 09:02:48 +0200 Subject: [PATCH] Moved gl_dynlight to hwrenderer because it does not depend on any direct renderer info. --- src/CMakeLists.txt | 2 +- src/gl/compatibility/gl_20.cpp | 3 ++- src/gl/compatibility/gl_swshader20.cpp | 3 ++- src/gl/dynlights/gl_lightbuffer.cpp | 2 +- src/gl/dynlights/gl_shadowmap.cpp | 2 +- src/gl/scene/gl_flats.cpp | 2 +- src/gl/scene/gl_scene.cpp | 3 +-- src/gl/scene/gl_spritelight.cpp | 2 +- src/gl/scene/gl_walls.cpp | 2 +- src/gl/scene/gl_walls_draw.cpp | 2 +- .../dynlights/hw_dynlightdata.cpp} | 4 ++-- .../gl_dynlight.h => hwrenderer/dynlights/hw_dynlightdata.h} | 0 12 files changed, 14 insertions(+), 13 deletions(-) rename src/{gl/dynlights/gl_dynlight1.cpp => hwrenderer/dynlights/hw_dynlightdata.cpp} (98%) rename src/{gl/dynlights/gl_dynlight.h => hwrenderer/dynlights/hw_dynlightdata.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3bfd8d057..cd99ce541 100644 --- 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 index c76f5adad..25f4966d4 100644 --- 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 index 334a09612..17adec972 100644 --- 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 index aa37ea167..560097987 100644 --- 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 index 40940c26e..0d8f9ebbe 100644 --- a/src/gl/dynlights/gl_shadowmap.cpp +++ b/src/gl/dynlights/gl_shadowmap.cpp @@ -23,7 +23,6 @@ #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" @@ -31,6 +30,7 @@ #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 index fec7e8127..888cc189b 100644 --- a/src/gl/scene/gl_flats.cpp +++ b/src/gl/scene/gl_flats.cpp @@ -37,6 +37,7 @@ #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" @@ -44,7 +45,6 @@ #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 index 1d3524f75..1b1f1d28b 100644 --- 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 index 45d8dc8dd..d037cd728 100644 --- 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 index 95929c569..43687f523 100644 --- 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 index 295a843a4..05e12ed08 100644 --- a/src/gl/scene/gl_walls_draw.cpp +++ b/src/gl/scene/gl_walls_draw.cpp @@ -27,6 +27,7 @@ #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" @@ -34,7 +35,6 @@ #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 b/src/hwrenderer/dynlights/hw_dynlightdata.cpp similarity index 98% rename from src/gl/dynlights/gl_dynlight1.cpp rename to src/hwrenderer/dynlights/hw_dynlightdata.cpp index dfef66e46..c47a33124 100644 --- a/src/gl/dynlights/gl_dynlight1.cpp +++ b/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 b/src/hwrenderer/dynlights/hw_dynlightdata.h similarity index 100% rename from src/gl/dynlights/gl_dynlight.h rename to src/hwrenderer/dynlights/hw_dynlightdata.h