From d2ce635bbfbf2a68517ed7eac10b3923d0f3c3c8 Mon Sep 17 00:00:00 2001 From: raven02 Date: Wed, 16 Apr 2014 03:57:57 +0800 Subject: [PATCH] Remove option --- Core/Config.cpp | 1 - Core/Config.h | 1 - GPU/GLES/FragmentShaderGenerator.cpp | 4 ++-- UI/GameSettingsScreen.cpp | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 62e962d24..f0ec2dd3e 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -567,7 +567,6 @@ static ConfigSetting debuggerSettings[] = { static ConfigSetting speedHackSettings[] = { ReportedConfigSetting("PrescaleUV", &g_Config.bPrescaleUV, false), - ReportedConfigSetting("DisableAlphaTest", &g_Config.bDisableAlphaTest, false), ConfigSetting(false), }; diff --git a/Core/Config.h b/Core/Config.h index 300256da1..b7a022799 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -244,7 +244,6 @@ public: // * Still has major problems so off by default - need to store tex scale/offset per DeferredDrawCall, // which currently isn't done so if texscale/offset isn't static (like in Tekken 6) things go wrong. bool bPrescaleUV; - bool bDisableAlphaTest; // Helps PowerVR immensely, breaks some graphics // End GLES hacks. // Risky JIT optimizations diff --git a/GPU/GLES/FragmentShaderGenerator.cpp b/GPU/GLES/FragmentShaderGenerator.cpp index c31683f53..5a0c3b8d3 100644 --- a/GPU/GLES/FragmentShaderGenerator.cpp +++ b/GPU/GLES/FragmentShaderGenerator.cpp @@ -283,7 +283,7 @@ void ComputeFragmentShaderID(FragmentShaderID *id) { } else { bool lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled(); bool enableFog = gstate.isFogEnabled() && !gstate.isModeThrough(); - bool enableAlphaTest = gstate.isAlphaTestEnabled() && !IsAlphaTestTriviallyTrue() && !g_Config.bDisableAlphaTest; + bool enableAlphaTest = gstate.isAlphaTestEnabled() && !IsAlphaTestTriviallyTrue(); bool alphaTestAgainstZero = gstate.getAlphaTestRef() == 0; bool enableColorTest = gstate.isColorTestEnabled() && !IsColorTestTriviallyTrue(); bool alphaToColorDoubling = AlphaToColorDoubling(); @@ -404,7 +404,7 @@ void GenerateFragmentShader(char *buffer) { bool lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled(); bool doTexture = gstate.isTextureMapEnabled() && !gstate.isModeClear(); bool enableFog = gstate.isFogEnabled() && !gstate.isModeThrough() && !gstate.isModeClear(); - bool enableAlphaTest = gstate.isAlphaTestEnabled() && !IsAlphaTestTriviallyTrue() && !gstate.isModeClear() && !g_Config.bDisableAlphaTest; + bool enableAlphaTest = gstate.isAlphaTestEnabled() && !IsAlphaTestTriviallyTrue() && !gstate.isModeClear(); bool alphaTestAgainstZero = gstate.getAlphaTestRef() == 0; bool enableColorTest = gstate.isColorTestEnabled() && !IsColorTestTriviallyTrue() && !gstate.isModeClear(); bool alphaToColorDoubling = AlphaToColorDoubling(); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index bd6981622..8e6bbdda4 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -199,8 +199,6 @@ void GameSettingsScreen::CreateViews() { graphicsSettings->Add(new ItemHeader(gs->T("Hack Settings", "Hack Settings (these WILL cause glitches)"))); graphicsSettings->Add(new CheckBox(&g_Config.bTimerHack, gs->T("Timer Hack"))); - // Maybe hide this on non-PVR? - graphicsSettings->Add(new CheckBox(&g_Config.bDisableAlphaTest, gs->T("Disable Alpha Test (PowerVR speedup)")))->OnClick.Handle(this, &GameSettingsScreen::OnShaderChange); graphicsSettings->Add(new CheckBox(&g_Config.bDisableStencilTest, gs->T("Disable Stencil Test"))); graphicsSettings->Add(new CheckBox(&g_Config.bAlphaMaskHack, gs->T("Alpha Mask Hack (3rd Birthday)"))); graphicsSettings->Add(new CheckBox(&g_Config.bAlwaysDepthWrite, gs->T("Always Depth Write")));