diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-09-10 13:56:43 -0400 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-09-10 13:56:43 -0400 |
| commit | 3014feedc839d69931079ad3c4f645ef51055e1a (patch) | |
| tree | 07855c50da98ae185adbc250ffed2b852d1bc11e /Source/Core/VideoCommon | |
| parent | 257f2ef739793b571fdbc72356a3d8f2de325bee (diff) | |
| parent | 74b20e627ca524366b0a4fa617d59014cd2c967c (diff) | |
Merge pull request #3012 from degasus/destAlpha
VideoCommon: Drop "Disable destAlpha" hack
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Debugger.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexManagerBase.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.h | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/Debugger.cpp b/Source/Core/VideoCommon/Debugger.cpp index 755293b26c..24ec679400 100644 --- a/Source/Core/VideoCommon/Debugger.cpp +++ b/Source/Core/VideoCommon/Debugger.cpp @@ -82,7 +82,7 @@ void GFXDebuggerBase::DumpPixelShader(const std::string& path) const std::string filename = StringFromFormat("%sdump_ps.txt", path.c_str()); std::string output; - bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24; + bool useDstAlpha = bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24; if (!useDstAlpha) { output = "Destination alpha disabled:\n"; diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index e9e8ebf901..6358ed371c 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -250,8 +250,7 @@ void VertexManager::Flush() GeometryShaderManager::SetConstants(); PixelShaderManager::SetConstants(); - bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && - bpmem.dstalpha.enable && + bool useDstAlpha = bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24; diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index e53c651cd7..6aadfbf075 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -80,7 +80,6 @@ void VideoConfig::Load(const std::string& ini_file) settings->Get("MSAA", &iMultisampleMode, 0); settings->Get("SSAA", &bSSAA, false); settings->Get("EFBScale", &iEFBScale, (int)SCALE_1X); // native - settings->Get("DstAlphaPass", &bDstAlphaPass, false); settings->Get("TexFmtOverlayEnable", &bTexFmtOverlayEnable, 0); settings->Get("TexFmtOverlayCenter", &bTexFmtOverlayCenter, 0); settings->Get("WireFrame", &bWireFrame, 0); @@ -191,7 +190,6 @@ void VideoConfig::GameIniLoad() } } - CHECK_SETTING("Video_Settings", "DstAlphaPass", bDstAlphaPass); CHECK_SETTING("Video_Settings", "DisableFog", bDisableFog); CHECK_SETTING("Video_Enhancements", "ForceFiltering", bForceFiltering); @@ -282,7 +280,6 @@ void VideoConfig::Save(const std::string& ini_file) settings->Set("TexFmtOverlayEnable", bTexFmtOverlayEnable); settings->Set("TexFmtOverlayCenter", bTexFmtOverlayCenter); settings->Set("Wireframe", bWireFrame); - settings->Set("DstAlphaPass", bDstAlphaPass); settings->Set("DisableFog", bDisableFog); settings->Set("EnableShaderDebugging", bEnableShaderDebugging); settings->Set("BorderlessFullscreen", bBorderlessFullscreen); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 64587b0642..489929f5fd 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -96,7 +96,6 @@ struct VideoConfig final // Render bool bWireFrame; - bool bDstAlphaPass; bool bDisableFog; // Utility |