From 3a742e99bbf223bd268024a32ad6d1a5362be47f Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Tue, 30 Nov 2021 17:51:43 -0800 Subject: [PATCH] Software: Remove config to disable ZComploc and ZFreeze These aren't particularly useful, and make the code a bit more confusing. If for some reason someone wants to test what happens when these functions are disabled, it's easier to just edit the code that implements them. They aren't exposed in the UI, so one would need to restart Dolphin to do it anyways. --- Source/Core/Core/Config/GraphicsSettings.cpp | 2 -- Source/Core/Core/Config/GraphicsSettings.h | 2 -- Source/Core/VideoBackends/Software/Rasterizer.cpp | 4 ++-- Source/Core/VideoBackends/Software/Tev.cpp | 3 +-- Source/Core/VideoCommon/VideoConfig.cpp | 2 -- Source/Core/VideoCommon/VideoConfig.h | 2 -- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp index 18a9e693ff..b1d7e879ea 100644 --- a/Source/Core/Core/Config/GraphicsSettings.cpp +++ b/Source/Core/Core/Config/GraphicsSettings.cpp @@ -90,8 +90,6 @@ const Info GFX_SHADER_PRECOMPILER_THREADS{ const Info GFX_SAVE_TEXTURE_CACHE_TO_STATE{ {System::GFX, "Settings", "SaveTextureCacheToState"}, true}; -const Info GFX_SW_ZCOMPLOC{{System::GFX, "Settings", "SWZComploc"}, true}; -const Info GFX_SW_ZFREEZE{{System::GFX, "Settings", "SWZFreeze"}, true}; const Info GFX_SW_DUMP_OBJECTS{{System::GFX, "Settings", "SWDumpObjects"}, false}; const Info GFX_SW_DUMP_TEV_STAGES{{System::GFX, "Settings", "SWDumpTevStages"}, false}; const Info GFX_SW_DUMP_TEV_TEX_FETCHES{{System::GFX, "Settings", "SWDumpTevTexFetches"}, diff --git a/Source/Core/Core/Config/GraphicsSettings.h b/Source/Core/Core/Config/GraphicsSettings.h index 710b6ca220..387233e27d 100644 --- a/Source/Core/Core/Config/GraphicsSettings.h +++ b/Source/Core/Core/Config/GraphicsSettings.h @@ -72,8 +72,6 @@ extern const Info GFX_SHADER_COMPILER_THREADS; extern const Info GFX_SHADER_PRECOMPILER_THREADS; extern const Info GFX_SAVE_TEXTURE_CACHE_TO_STATE; -extern const Info GFX_SW_ZCOMPLOC; -extern const Info GFX_SW_ZFREEZE; extern const Info GFX_SW_DUMP_OBJECTS; extern const Info GFX_SW_DUMP_TEV_STAGES; extern const Info GFX_SW_DUMP_TEV_TEX_FETCHES; diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index f886858124..d29e4954f2 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -80,7 +80,7 @@ static void Draw(s32 x, s32 y, s32 xi, s32 yi) s32 z = (s32)std::clamp(ZSlope.GetValue(dx, dy), 0.0f, 16777215.0f); - if (bpmem.UseEarlyDepthTest() && g_ActiveConfig.bZComploc) + if (bpmem.UseEarlyDepthTest()) { // TODO: Test if perf regs are incremented even if test is disabled EfbInterface::IncPerfCounterQuadCount(PQ_ZCOMP_INPUT_ZCOMPLOC); @@ -354,7 +354,7 @@ void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v // rejected during clipping! // We're currently sloppy at this since we abort early if any of the culling/clipping/scissoring // tests fail. - if (!bpmem.genMode.zfreeze || !g_ActiveConfig.bZFreeze) + if (!bpmem.genMode.zfreeze) InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31); diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 6905920405..64e0f7774b 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -840,8 +840,7 @@ void Tev::Draw() output[BLU_C] = (output[BLU_C] * invFog + fogInt * bpmem.fog.color.b) >> 8; } - const bool late_ztest = !bpmem.zcontrol.early_ztest || !g_ActiveConfig.bZComploc; - if (late_ztest && bpmem.zmode.testenable) + if (bpmem.UseLateDepthTest()) { // TODO: Check against hw if these values get incremented even if depth testing is disabled EfbInterface::IncPerfCounterQuadCount(PQ_ZCOMP_INPUT); diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 861cd7281c..aa6880e887 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -97,8 +97,6 @@ void VideoConfig::Refresh() iShaderCompilerThreads = Config::Get(Config::GFX_SHADER_COMPILER_THREADS); iShaderPrecompilerThreads = Config::Get(Config::GFX_SHADER_PRECOMPILER_THREADS); - bZComploc = Config::Get(Config::GFX_SW_ZCOMPLOC); - bZFreeze = Config::Get(Config::GFX_SW_ZFREEZE); bDumpObjects = Config::Get(Config::GFX_SW_DUMP_OBJECTS); bDumpTevStages = Config::Get(Config::GFX_SW_DUMP_TEV_STAGES); bDumpTevTextureFetches = Config::Get(Config::GFX_SW_DUMP_TEV_TEX_FETCHES); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 659611a170..1389a385fa 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -152,8 +152,6 @@ struct VideoConfig final // VideoSW Debugging int drawStart = 0; int drawEnd = 0; - bool bZComploc = false; - bool bZFreeze = false; bool bDumpObjects = false; bool bDumpTevStages = false; bool bDumpTevTextureFetches = false;