- moved hw_cvars to 'common'.

src/CMakeLists.txt

@@ -969,7 +969,6 @@ set (PCH_SOURCES
 	rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp
 	rendering/hwrenderer/textures/hw_precache.cpp
 	rendering/hwrenderer/utility/hw_clock.cpp
-	rendering/hwrenderer/utility/hw_cvars.cpp
 	rendering/hwrenderer/utility/hw_draw2d.cpp
 	rendering/hwrenderer/utility/hw_lighting.cpp
 	rendering/hwrenderer/utility/hw_shaderpatcher.cpp
@@ -1144,6 +1143,7 @@ set (PCH_SOURCES
 	common/objects/dobjgc.cpp
 	common/objects/dobjtype.cpp
 	common/rendering/r_videoscale.cpp
+	common/rendering/hwrenderer/data/hw_cvars.cpp
 	common/rendering/hwrenderer/data/hw_vrmodes.cpp
 	common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
 	common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp

src/common/rendering/hwrenderer/data/hw_cvars.cpp

@@ -118,11 +118,6 @@ CUSTOM_CVARD(Float, gl_texture_filter_anisotropic, 8, CVAR_ARCHIVE | CVAR_GLOBAL
 	screen->TextureFilterChanged();
 }
 
-CCMD(gl_flush)
-{
-	TexMan.FlushAll();
-}
-
 CUSTOM_CVARD(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "changes the texture filtering settings")
 {
 	if (self < 0 || self > 6) self=4;

src/common/rendering/hwrenderer/data/hw_vrmodes.cpp

@@ -26,7 +26,7 @@
 */
 
 #include "vectors.h" // RAD2DEG
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hw_vrmodes.h"
 #include "v_video.h"
 #include "version.h"

src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp

@@ -21,7 +21,7 @@
 
 #include "v_video.h"
 #include "hw_postprocess.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/postprocessing/hw_postprocess_cvars.h"
 #include "hwrenderer/postprocessing/hw_postprocessshader.h"
 #include <random>

src/common/textures/texturemanager.cpp

@@ -1541,3 +1541,9 @@ FTextureID FTextureID::operator +(int offset) throw()
 	if (texnum + offset >= TexMan.NumTextures()) return FTextureID(-1);
 	return FTextureID(texnum + offset);
 }
+
+CCMD(flushtextures)
+{
+	TexMan.FlushAll();
+}
+

src/rendering/2d/v_blend.cpp

@@ -46,7 +46,7 @@
 #include "vm.h"
 #include "v_palette.h"
 #include "r_utility.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 
 CVAR(Float, underwater_fade_scalar, 1.0f, CVAR_ARCHIVE) // [Nash] user-settable underwater blend intensity
 CVAR( Float, blood_fade_scalar, 1.0f, CVAR_ARCHIVE )	// [SP] Pulled from Skulltag - changed default from 0.5 to 1.0

src/rendering/gl/renderer/gl_renderbuffers.cpp

@@ -23,7 +23,7 @@
 #include "v_video.h"
 #include "gl_interface.h"
 #include "printf.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"

src/rendering/gl/renderer/gl_renderer.cpp

@@ -42,7 +42,7 @@
 
 #include "gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"

src/rendering/gl/renderer/gl_renderstate.cpp

@@ -30,7 +30,7 @@
 #include "r_data/colormaps.h"
 #include "gl_system.h"
 #include "gl_interface.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/scene/hw_skydome.h"
 #include "gl/shaders/gl_shader.h"

src/rendering/gl/shaders/gl_shaderprogram.cpp

@@ -28,7 +28,7 @@
 #include "gl_system.h"
 #include "v_video.h"
 #include "gl_interface.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/shaders/gl_shaderprogram.h"
 #include "hwrenderer/utility/hw_shaderpatcher.h"

src/rendering/gl/textures/gl_hwtexture.cpp

@@ -41,7 +41,7 @@
 #include "hw_material.h"
 
 #include "gl_interface.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"

src/rendering/gl/textures/gl_samplers.cpp

@@ -36,7 +36,7 @@
 #include "c_cvars.h"
 
 #include "gl_interface.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl_samplers.h"

src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp

@@ -21,7 +21,7 @@
 //
 
 #include "hwrenderer/dynlights/hw_shadowmap.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 #include "hwrenderer/data/buffers.h"
 #include "hwrenderer/data/shaderuniforms.h"

src/rendering/hwrenderer/hw_entrypoint.cpp

@@ -41,7 +41,7 @@
 #include "hwrenderer/data/flatvertices.h"
 
 #include "hwrenderer/dynlights/hw_lightbuffer.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/scene/hw_clipper.h"

src/rendering/hwrenderer/scene/hw_decal.cpp

@@ -30,7 +30,7 @@
 #include "r_utility.h"
 #include "g_levellocals.h"
 #include "hw_material.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/utility/hw_lighting.h"

src/rendering/hwrenderer/scene/hw_drawinfo.cpp

@@ -37,7 +37,7 @@
 #include "po_man.h"
 #include "r_data/models/models.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/dynlights/hw_lightbuffer.h"

src/rendering/hwrenderer/scene/hw_drawlistadd.cpp

@@ -21,7 +21,7 @@
 //
 
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/dynlights/hw_lightbuffer.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawinfo.h"

src/rendering/hwrenderer/scene/hw_fakeflat.cpp

@@ -33,7 +33,7 @@
 #include "r_sky.h"
 #include "hw_fakeflat.h"
 #include "hw_drawinfo.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "r_utility.h"
 #include "texturemanager.h"
 

src/rendering/hwrenderer/scene/hw_flats.cpp

@@ -37,7 +37,7 @@
 #include "p_lnspec.h"
 #include "matrix.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hw_material.h"

src/rendering/hwrenderer/scene/hw_renderstate.cpp

@@ -30,7 +30,7 @@
 #include "hw_drawstructs.h"
 #include "hw_portal.h"
 #include "hwrenderer/utility/hw_lighting.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 
 
 //==========================================================================

src/rendering/hwrenderer/scene/hw_sprites.cpp

@@ -50,7 +50,7 @@
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/scene/hw_portal.h"
 #include "hwrenderer/data/flatvertices.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hw_material.h"

src/rendering/hwrenderer/scene/hw_walls.cpp

@@ -34,7 +34,7 @@
 #include "texturemanager.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 #include "hw_material.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hwrenderer/scene/hw_drawinfo.h"

src/rendering/hwrenderer/scene/hw_weapon.cpp

@@ -40,7 +40,7 @@
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 #include "hw_material.h"
 #include "hwrenderer/utility/hw_lighting.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/data/flatvertices.h"

src/rendering/hwrenderer/utility/hw_draw2d.cpp

@@ -33,7 +33,7 @@
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/utility/hw_clock.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hw_renderstate.h"
 #include "r_videoscale.h"
 

src/rendering/polyrenderer/backend/poly_framebuffer.cpp

@@ -31,7 +31,7 @@
 
 #include "hwrenderer/utility/hw_clock.h"
 #include "hw_vrmodes.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/models/hw_models.h"
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"

src/rendering/polyrenderer/backend/poly_hwtexture.cpp

@@ -24,7 +24,7 @@
 #include "c_cvars.h"
 #include "r_data/colormaps.h"
 #include "hw_material.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hw_renderstate.h"
 #include "poly_framebuffer.h"
 #include "poly_hwtexture.h"

src/rendering/polyrenderer/backend/poly_renderstate.cpp

@@ -29,7 +29,7 @@
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
 #include "hwrenderer/dynlights/hw_lightbuffer.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"

src/rendering/vulkan/renderer/vk_postprocess.cpp

@@ -29,7 +29,7 @@
 #include "vulkan/system/vk_swapchain.h"
 #include "vulkan/renderer/vk_renderstate.h"
 #include "vulkan/textures/vk_imagetransition.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/postprocessing/hw_postprocess.h"
 #include "hwrenderer/postprocessing/hw_postprocess_cvars.h"
 #include "hw_vrmodes.h"

src/rendering/vulkan/renderer/vk_renderbuffers.cpp

@@ -26,7 +26,7 @@
 #include "vulkan/shaders/vk_shader.h"
 #include "vulkan/system/vk_builders.h"
 #include "vulkan/system/vk_framebuffer.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "templates.h"
 
 VkRenderBuffers::VkRenderBuffers()

src/rendering/vulkan/renderer/vk_renderstate.cpp

@@ -32,7 +32,7 @@
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_viewpointuniforms.h"
 #include "hwrenderer/dynlights/hw_lightbuffer.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/data/flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"

src/rendering/vulkan/system/vk_framebuffer.cpp

@@ -33,7 +33,7 @@
 
 #include "hwrenderer/utility/hw_clock.h"
 #include "hw_vrmodes.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hwrenderer/models/hw_models.h"
 #include "hwrenderer/scene/hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"

src/rendering/vulkan/textures/vk_hwtexture.cpp

@@ -24,7 +24,7 @@
 #include "c_cvars.h"
 #include "r_data/colormaps.h"
 #include "hw_material.h"
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "hw_renderstate.h"
 #include "vulkan/system/vk_objects.h"
 #include "vulkan/system/vk_builders.h"

src/rendering/vulkan/textures/vk_samplers.cpp

@@ -24,7 +24,7 @@
 #include "c_cvars.h"
 #include "v_video.h"
 
-#include "hwrenderer/utility/hw_cvars.h"
+#include "hw_cvars.h"
 #include "vulkan/system/vk_device.h"
 #include "vulkan/system/vk_builders.h"
 #include "vk_samplers.h"