diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 494127d5d..1f9c4e7b4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -770,8 +770,6 @@ set( FASTMATH_SOURCES common/textures/hires/xbr/xbrz.cpp common/textures/hires/xbr/xbrz_old.cpp common/rendering/gl_load/gl_load.c - rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp - rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp rendering/hwrenderer/dynlights/hw_dynlightdata.cpp rendering/hwrenderer/scene/hw_bsp.cpp rendering/hwrenderer/scene/hw_fakeflat.cpp @@ -968,8 +966,6 @@ set (PCH_SOURCES rendering/hwrenderer/scene/hw_skydome.cpp rendering/hwrenderer/scene/hw_drawlistadd.cpp rendering/hwrenderer/scene/hw_renderstate.cpp - rendering/hwrenderer/postprocessing/hw_postprocess.cpp - rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp rendering/hwrenderer/textures/hw_precache.cpp rendering/hwrenderer/utility/hw_clock.cpp @@ -1149,6 +1145,9 @@ set (PCH_SOURCES common/objects/dobjgc.cpp common/objects/dobjtype.cpp common/rendering/r_videoscale.cpp + common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp + common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp + common/rendering/gl_load/gl_interface.cpp common/scripting/core/dictionary.cpp common/scripting/core/dynarrays.cpp @@ -1477,7 +1476,8 @@ source_group("Common\\Platforms\\SDL Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT source_group("Common\\Platforms\\Win32 Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/platform/win32/.+") source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/.+") source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/.+") -source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+") +source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+") +source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+") source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+") source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+") source_group("Common\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/.+") diff --git a/src/rendering/hwrenderer/postprocessing/hw_postprocess.cpp b/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp similarity index 100% rename from src/rendering/hwrenderer/postprocessing/hw_postprocess.cpp rename to src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp diff --git a/src/rendering/hwrenderer/postprocessing/hw_postprocess.h b/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.h similarity index 100% rename from src/rendering/hwrenderer/postprocessing/hw_postprocess.h rename to src/common/rendering/hwrenderer/postprocessing/hw_postprocess.h diff --git a/src/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp b/src/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp similarity index 100% rename from src/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp rename to src/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp diff --git a/src/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h b/src/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h similarity index 100% rename from src/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h rename to src/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h diff --git a/src/rendering/hwrenderer/postprocessing/hw_postprocessshader.h b/src/common/rendering/hwrenderer/postprocessing/hw_postprocessshader.h similarity index 100% rename from src/rendering/hwrenderer/postprocessing/hw_postprocessshader.h rename to src/common/rendering/hwrenderer/postprocessing/hw_postprocessshader.h diff --git a/src/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp b/src/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp index 16eea4c13..1b181ec5a 100644 --- a/src/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp +++ b/src/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp @@ -21,7 +21,7 @@ #include "vm.h" #include "d_player.h" -#include "hw_postprocessshader.h" +#include "hwrenderer/postprocessing/hw_postprocessshader.h" #include "g_levellocals.h" TArray PostProcessShaders;