From 0c3635e22c4ab1c189dccc792b40b94e0beb9cec Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 27 Mar 2018 17:58:25 +0200 Subject: [PATCH] - removed vid_hw2d CVar. --- src/gl/system/gl_swframebuffer.cpp | 5 ----- src/polyrenderer/poly_renderer.cpp | 1 - src/polyrenderer/scene/poly_playersprite.cpp | 8 -------- src/swrenderer/r_swrenderer.cpp | 1 - src/swrenderer/scene/r_light.cpp | 1 - src/swrenderer/scene/r_scene.cpp | 8 -------- src/swrenderer/things/r_playersprite.cpp | 9 +-------- src/win32/fb_d3d9.cpp | 6 ------ 8 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/gl/system/gl_swframebuffer.cpp b/src/gl/system/gl_swframebuffer.cpp index 96d90ab1e..287e2bcfc 100644 --- a/src/gl/system/gl_swframebuffer.cpp +++ b/src/gl/system/gl_swframebuffer.cpp @@ -79,13 +79,8 @@ CVAR(Int, gl_showpacks, 0, 0) #ifndef WIN32 // Defined in fb_d3d9 for Windows CVAR(Bool, vid_hwaalines, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CUSTOM_CVAR(Bool, vid_hw2d, true, CVAR_NOINITCALL) -{ - V_SetBorderNeedRefresh(); -} #else EXTERN_CVAR(Bool, vid_hwaalines) -EXTERN_CVAR(Bool, vid_hw2d) #endif EXTERN_CVAR(Bool, fullscreen) diff --git a/src/polyrenderer/poly_renderer.cpp b/src/polyrenderer/poly_renderer.cpp index 644556972..fb4fa4915 100644 --- a/src/polyrenderer/poly_renderer.cpp +++ b/src/polyrenderer/poly_renderer.cpp @@ -39,7 +39,6 @@ #include "swrenderer/viewport/r_viewport.h" #include "swrenderer/r_swcolormaps.h" -EXTERN_CVAR(Bool, r_shadercolormaps) EXTERN_CVAR(Int, screenblocks) EXTERN_CVAR(Float, r_visibility) void InitGLRMapinfoData(); diff --git a/src/polyrenderer/scene/poly_playersprite.cpp b/src/polyrenderer/scene/poly_playersprite.cpp index 0ec193d79..7da66b198 100644 --- a/src/polyrenderer/scene/poly_playersprite.cpp +++ b/src/polyrenderer/scene/poly_playersprite.cpp @@ -34,7 +34,6 @@ EXTERN_CVAR(Bool, r_drawplayersprites) EXTERN_CVAR(Bool, r_deathcamera) EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor) -EXTERN_CVAR(Bool, r_shadercolormaps) void RenderPolyPlayerSprites::Render(PolyRenderThread *thread) { @@ -386,13 +385,6 @@ void RenderPolyPlayerSprites::RenderSprite(PolyRenderThread *thread, DPSprite *p noaccel = true; } } - // If we're drawing with a special colormap, but shaders for them are disabled, do - // not accelerate. - if (!r_shadercolormaps && (vis.Light.BaseColormap >= &SpecialSWColormaps[0] && - vis.Light.BaseColormap <= &SpecialSWColormaps.Last())) - { - noaccel = true; - } // If drawing with a BOOM colormap, disable acceleration. if (vis.Light.BaseColormap == &NormalLight && NormalLight.Maps != realcolormaps.Maps) { diff --git a/src/swrenderer/r_swrenderer.cpp b/src/swrenderer/r_swrenderer.cpp index 10ec9dd13..ae28995dd 100644 --- a/src/swrenderer/r_swrenderer.cpp +++ b/src/swrenderer/r_swrenderer.cpp @@ -60,7 +60,6 @@ CUSTOM_CVAR (Bool, cl_oldfreelooklimit, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG players[consoleplayer].SendPitchLimits(); } -EXTERN_CVAR(Bool, r_shadercolormaps) EXTERN_CVAR(Float, maxviewpitch) // [SP] CVAR from OpenGL Renderer EXTERN_CVAR(Bool, r_drawvoxels) diff --git a/src/swrenderer/scene/r_light.cpp b/src/swrenderer/scene/r_light.cpp index 166bef562..c120c22eb 100644 --- a/src/swrenderer/scene/r_light.cpp +++ b/src/swrenderer/scene/r_light.cpp @@ -42,7 +42,6 @@ #include "swrenderer/scene/r_light.h" #include "swrenderer/viewport/r_viewport.h" -CVAR(Bool, r_shadercolormaps, true, CVAR_ARCHIVE) EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor) namespace swrenderer diff --git a/src/swrenderer/scene/r_scene.cpp b/src/swrenderer/scene/r_scene.cpp index 386765f1f..6118d2b15 100644 --- a/src/swrenderer/scene/r_scene.cpp +++ b/src/swrenderer/scene/r_scene.cpp @@ -63,7 +63,6 @@ void PeekThreadedErrorPane(); #endif -EXTERN_CVAR(Bool, r_shadercolormaps) EXTERN_CVAR(Int, r_clearbuffer) CVAR(Bool, r_scene_multithreaded, false, 0); @@ -164,13 +163,6 @@ namespace swrenderer MainThread()->Viewport->viewpoint.camera->renderflags = savedflags; interpolator.RestoreInterpolations(); - - // If we don't want shadered colormaps, NULL it now so that the - // copy to the screen does not use a special colormap shader. - if (!r_shadercolormaps && !MainThread()->Viewport->RenderTarget->IsBgra()) - { - CameraLight::Instance()->ClearShaderColormap(); - } } void RenderScene::RenderPSprites() diff --git a/src/swrenderer/things/r_playersprite.cpp b/src/swrenderer/things/r_playersprite.cpp index f9c4a265a..b26870563 100644 --- a/src/swrenderer/things/r_playersprite.cpp +++ b/src/swrenderer/things/r_playersprite.cpp @@ -68,7 +68,6 @@ EXTERN_CVAR(Bool, r_drawplayersprites) EXTERN_CVAR(Bool, r_deathcamera) -EXTERN_CVAR(Bool, r_shadercolormaps) EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor) namespace swrenderer @@ -388,13 +387,7 @@ namespace swrenderer noaccel = true; } } - // If we're drawing with a special colormap, but shaders for them are disabled, do - // not accelerate. - if (!r_shadercolormaps && (vis.Light.BaseColormap >= &SpecialSWColormaps[0] && - vis.Light.BaseColormap <= &SpecialSWColormaps.Last())) - { - noaccel = true; - } + // If drawing with a BOOM colormap, disable acceleration. if (vis.Light.BaseColormap == &NormalLight && NormalLight.Maps != realcolormaps.Maps) { diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index b78ae2454..b7c0e8369 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -187,13 +187,7 @@ const char *const D3DFB::ShaderNames[D3DFB::NUM_SHADERS] = // PUBLIC DATA DEFINITIONS ------------------------------------------------- -CUSTOM_CVAR(Bool, vid_hw2d, true, CVAR_NOINITCALL) -{ - V_SetBorderNeedRefresh(); -} - CVAR(Bool, d3d_antilag, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) -CVAR(Int, d3d_showpacks, 0, 0) CVAR(Bool, vid_hwaalines, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) // CODE --------------------------------------------------------------------