From cf41a0b1fb716d58da9319fd5c69e568254e6817 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 26 Apr 2020 11:38:38 +0200 Subject: [PATCH] - moved hw_cvars to 'common'. --- src/CMakeLists.txt | 2 +- .../rendering/hwrenderer/data}/hw_cvars.cpp | 5 ----- .../utility => common/rendering/hwrenderer/data}/hw_cvars.h | 0 src/common/rendering/hwrenderer/data/hw_vrmodes.cpp | 2 +- .../rendering/hwrenderer/postprocessing/hw_postprocess.cpp | 2 +- src/common/textures/texturemanager.cpp | 6 ++++++ src/rendering/2d/v_blend.cpp | 2 +- src/rendering/gl/renderer/gl_renderbuffers.cpp | 2 +- src/rendering/gl/renderer/gl_renderer.cpp | 2 +- src/rendering/gl/renderer/gl_renderstate.cpp | 2 +- src/rendering/gl/shaders/gl_shaderprogram.cpp | 2 +- src/rendering/gl/textures/gl_hwtexture.cpp | 2 +- src/rendering/gl/textures/gl_samplers.cpp | 2 +- src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp | 2 +- src/rendering/hwrenderer/hw_entrypoint.cpp | 2 +- src/rendering/hwrenderer/scene/hw_decal.cpp | 2 +- src/rendering/hwrenderer/scene/hw_drawinfo.cpp | 2 +- src/rendering/hwrenderer/scene/hw_drawlistadd.cpp | 2 +- src/rendering/hwrenderer/scene/hw_fakeflat.cpp | 2 +- src/rendering/hwrenderer/scene/hw_flats.cpp | 2 +- src/rendering/hwrenderer/scene/hw_renderstate.cpp | 2 +- src/rendering/hwrenderer/scene/hw_sprites.cpp | 2 +- src/rendering/hwrenderer/scene/hw_walls.cpp | 2 +- src/rendering/hwrenderer/scene/hw_weapon.cpp | 2 +- src/rendering/hwrenderer/utility/hw_draw2d.cpp | 2 +- src/rendering/polyrenderer/backend/poly_framebuffer.cpp | 2 +- src/rendering/polyrenderer/backend/poly_hwtexture.cpp | 2 +- src/rendering/polyrenderer/backend/poly_renderstate.cpp | 2 +- src/rendering/vulkan/renderer/vk_postprocess.cpp | 2 +- src/rendering/vulkan/renderer/vk_renderbuffers.cpp | 2 +- src/rendering/vulkan/renderer/vk_renderstate.cpp | 2 +- src/rendering/vulkan/system/vk_framebuffer.cpp | 2 +- src/rendering/vulkan/textures/vk_hwtexture.cpp | 2 +- src/rendering/vulkan/textures/vk_samplers.cpp | 2 +- 34 files changed, 37 insertions(+), 36 deletions(-) rename src/{rendering/hwrenderer/utility => common/rendering/hwrenderer/data}/hw_cvars.cpp (99%) rename src/{rendering/hwrenderer/utility => common/rendering/hwrenderer/data}/hw_cvars.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 426cb505f..e7606aa5c 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/rendering/hwrenderer/utility/hw_cvars.cpp b/src/common/rendering/hwrenderer/data/hw_cvars.cpp similarity index 99% rename from src/rendering/hwrenderer/utility/hw_cvars.cpp rename to src/common/rendering/hwrenderer/data/hw_cvars.cpp index d0a4c19e9..2d5d4a9f2 100644 --- a/src/rendering/hwrenderer/utility/hw_cvars.cpp +++ b/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; diff --git a/src/rendering/hwrenderer/utility/hw_cvars.h b/src/common/rendering/hwrenderer/data/hw_cvars.h similarity index 100% rename from src/rendering/hwrenderer/utility/hw_cvars.h rename to src/common/rendering/hwrenderer/data/hw_cvars.h diff --git a/src/common/rendering/hwrenderer/data/hw_vrmodes.cpp b/src/common/rendering/hwrenderer/data/hw_vrmodes.cpp index c57a6297e..a105f48c2 100644 --- a/src/common/rendering/hwrenderer/data/hw_vrmodes.cpp +++ b/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" diff --git a/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp b/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp index db991145a..519e03b11 100644 --- a/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp +++ b/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 diff --git a/src/common/textures/texturemanager.cpp b/src/common/textures/texturemanager.cpp index a94a1592a..c7cffd07c 100644 --- a/src/common/textures/texturemanager.cpp +++ b/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(); +} + diff --git a/src/rendering/2d/v_blend.cpp b/src/rendering/2d/v_blend.cpp index 95780e31c..f654ee39b 100644 --- a/src/rendering/2d/v_blend.cpp +++ b/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 diff --git a/src/rendering/gl/renderer/gl_renderbuffers.cpp b/src/rendering/gl/renderer/gl_renderbuffers.cpp index 319cf1278..b6e1000fd 100644 --- a/src/rendering/gl/renderer/gl_renderbuffers.cpp +++ b/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" diff --git a/src/rendering/gl/renderer/gl_renderer.cpp b/src/rendering/gl/renderer/gl_renderer.cpp index a101f7ec7..eaffe1d3c 100644 --- a/src/rendering/gl/renderer/gl_renderer.cpp +++ b/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" diff --git a/src/rendering/gl/renderer/gl_renderstate.cpp b/src/rendering/gl/renderer/gl_renderstate.cpp index 16dbedcbe..e59265020 100644 --- a/src/rendering/gl/renderer/gl_renderstate.cpp +++ b/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" diff --git a/src/rendering/gl/shaders/gl_shaderprogram.cpp b/src/rendering/gl/shaders/gl_shaderprogram.cpp index f958bd35d..a79af0ce1 100644 --- a/src/rendering/gl/shaders/gl_shaderprogram.cpp +++ b/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" diff --git a/src/rendering/gl/textures/gl_hwtexture.cpp b/src/rendering/gl/textures/gl_hwtexture.cpp index 6b0cd9995..2f807a5d6 100644 --- a/src/rendering/gl/textures/gl_hwtexture.cpp +++ b/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" diff --git a/src/rendering/gl/textures/gl_samplers.cpp b/src/rendering/gl/textures/gl_samplers.cpp index 7f4e9ef3e..39d8146d7 100644 --- a/src/rendering/gl/textures/gl_samplers.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp b/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp index 99bdaed53..d32d2d7a2 100644 --- a/src/rendering/hwrenderer/dynlights/hw_shadowmap.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/hw_entrypoint.cpp b/src/rendering/hwrenderer/hw_entrypoint.cpp index c2e06a830..ea61d8230 100644 --- a/src/rendering/hwrenderer/hw_entrypoint.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_decal.cpp b/src/rendering/hwrenderer/scene/hw_decal.cpp index de9b28305..45596b151 100644 --- a/src/rendering/hwrenderer/scene/hw_decal.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index 2d07869a5..d8146664f 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp b/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp index 3c4a85f38..e48326e11 100644 --- a/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_fakeflat.cpp b/src/rendering/hwrenderer/scene/hw_fakeflat.cpp index a5431bc3b..a436c1209 100644 --- a/src/rendering/hwrenderer/scene/hw_fakeflat.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_flats.cpp b/src/rendering/hwrenderer/scene/hw_flats.cpp index 69b1712c3..b2976527c 100644 --- a/src/rendering/hwrenderer/scene/hw_flats.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_renderstate.cpp b/src/rendering/hwrenderer/scene/hw_renderstate.cpp index 62841f0b6..b0d892b61 100644 --- a/src/rendering/hwrenderer/scene/hw_renderstate.cpp +++ b/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" //========================================================================== diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp index 020bae1f2..00ee37e9f 100644 --- a/src/rendering/hwrenderer/scene/hw_sprites.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_walls.cpp b/src/rendering/hwrenderer/scene/hw_walls.cpp index bbb248216..bc788fe1d 100644 --- a/src/rendering/hwrenderer/scene/hw_walls.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/scene/hw_weapon.cpp b/src/rendering/hwrenderer/scene/hw_weapon.cpp index ca4f388d7..debbf71bb 100644 --- a/src/rendering/hwrenderer/scene/hw_weapon.cpp +++ b/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" diff --git a/src/rendering/hwrenderer/utility/hw_draw2d.cpp b/src/rendering/hwrenderer/utility/hw_draw2d.cpp index 40e3451c7..2abc5397e 100644 --- a/src/rendering/hwrenderer/utility/hw_draw2d.cpp +++ b/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" diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp index 6091b4ed9..3eb79890b 100644 --- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp +++ b/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" diff --git a/src/rendering/polyrenderer/backend/poly_hwtexture.cpp b/src/rendering/polyrenderer/backend/poly_hwtexture.cpp index 373624209..297166514 100644 --- a/src/rendering/polyrenderer/backend/poly_hwtexture.cpp +++ b/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" diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.cpp b/src/rendering/polyrenderer/backend/poly_renderstate.cpp index a8f155055..c114c9ac3 100644 --- a/src/rendering/polyrenderer/backend/poly_renderstate.cpp +++ b/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" diff --git a/src/rendering/vulkan/renderer/vk_postprocess.cpp b/src/rendering/vulkan/renderer/vk_postprocess.cpp index 403a9dfcd..1e85705a2 100644 --- a/src/rendering/vulkan/renderer/vk_postprocess.cpp +++ b/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" diff --git a/src/rendering/vulkan/renderer/vk_renderbuffers.cpp b/src/rendering/vulkan/renderer/vk_renderbuffers.cpp index 2557054ea..e3217076d 100644 --- a/src/rendering/vulkan/renderer/vk_renderbuffers.cpp +++ b/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() diff --git a/src/rendering/vulkan/renderer/vk_renderstate.cpp b/src/rendering/vulkan/renderer/vk_renderstate.cpp index 3e2cc97e7..55484d894 100644 --- a/src/rendering/vulkan/renderer/vk_renderstate.cpp +++ b/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" diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/rendering/vulkan/system/vk_framebuffer.cpp index a783f8c10..9a96f87e9 100644 --- a/src/rendering/vulkan/system/vk_framebuffer.cpp +++ b/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" diff --git a/src/rendering/vulkan/textures/vk_hwtexture.cpp b/src/rendering/vulkan/textures/vk_hwtexture.cpp index d686fedd7..e39c5e009 100644 --- a/src/rendering/vulkan/textures/vk_hwtexture.cpp +++ b/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" diff --git a/src/rendering/vulkan/textures/vk_samplers.cpp b/src/rendering/vulkan/textures/vk_samplers.cpp index d82f4bb01..23afff2c6 100644 --- a/src/rendering/vulkan/textures/vk_samplers.cpp +++ b/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"