diff options
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/VertexShaderManager.cpp | 17 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.h | 2 |
3 files changed, 2 insertions, 18 deletions
diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 06fff792e2..337807bb06 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -51,7 +51,6 @@ namespace // Control Variables static ProjectionHack g_ProjHack1; static ProjectionHack g_ProjHack2; -static bool g_ProjHack3; } // Namespace float PHackValue(std::string sValue) @@ -90,7 +89,6 @@ void UpdateProjectionHack(int iPhackvalue[], std::string sPhackvalue[]) { float fhackvalue1 = 0, fhackvalue2 = 0; float fhacksign1 = 1.0, fhacksign2 = 1.0; - bool bProjHack3 = false; const char *sTemp[2]; if (iPhackvalue[0] == 1) @@ -108,17 +106,11 @@ void UpdateProjectionHack(int iPhackvalue[], std::string sPhackvalue[]) fhackvalue2 = PHackValue(sPhackvalue[1]); NOTICE_LOG(VIDEO, "- zFar Correction = (%f + zFar)%s", fhackvalue2, sTemp[1]); - sTemp[0] = "DISABLED"; - bProjHack3 = (iPhackvalue[3] == 1) ? true : bProjHack3; - if (bProjHack3) - sTemp[0] = "ENABLED"; - NOTICE_LOG(VIDEO, "- Extra Parameter: %s", sTemp[0]); } // Set the projections hacks g_ProjHack1 = ProjectionHack(fhacksign1, fhackvalue1); g_ProjHack2 = ProjectionHack(fhacksign2, fhackvalue2); - g_ProjHack3 = bProjHack3; } @@ -452,15 +444,8 @@ void VertexShaderManager::SetConstants() g_fProjectionMatrix[12] = 0.0f; g_fProjectionMatrix[13] = 0.0f; - /* - projection hack for metroid other m...attempt to remove black projection layer from cut scenes. - g_fProjectionMatrix[15] = 1.0f was the default setting before - this hack was added...setting g_fProjectionMatrix[14] to -1 might make the hack more stable, needs more testing. - Only works for OGL...this is not helping DX11 - */ - g_fProjectionMatrix[14] = 0.0f; - g_fProjectionMatrix[15] = (g_ProjHack3 && rawProjection[0] == 2.0f ? 0.0f : 1.0f); //causes either the efb copy or bloom layer not to show if proj hack enabled + g_fProjectionMatrix[15] = 1.0f; SETSTAT_FT(stats.g2proj_0, g_fProjectionMatrix[0]); SETSTAT_FT(stats.g2proj_1, g_fProjectionMatrix[1]); diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 23a078e244..b4e211439a 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -197,7 +197,6 @@ void VideoConfig::GameIniLoad() CHECK_SETTING("Video", "ProjectionHack", iPhackvalue[0]); CHECK_SETTING("Video", "PH_SZNear", iPhackvalue[1]); CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]); - CHECK_SETTING("Video", "PH_ExtraParam", iPhackvalue[3]); CHECK_SETTING("Video", "PH_ZNear", sPhackvalue[0]); CHECK_SETTING("Video", "PH_ZFar", sPhackvalue[1]); CHECK_SETTING("Video", "UseBBox", bUseBBox); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 09cfa79a2c..944bab0e0a 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -114,7 +114,7 @@ struct VideoConfig bool bCopyEFBToTexture; bool bCopyEFBScaled; int iSafeTextureCache_ColorSamples; - int iPhackvalue[4]; + int iPhackvalue[3]; std::string sPhackvalue[2]; float fAspectRatioHackW, fAspectRatioHackH; bool bUseBBox; |