From 0fdea30ac3ba3b0d1a5b35956561e6fffb3f27f0 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Fri, 14 Dec 2018 13:56:42 +0100 Subject: [PATCH 1/2] Remove "Timer Hack" setting. Untested, probably low usage and unclear utility. --- Core/Config.cpp | 1 - Core/CoreTiming.cpp | 7 ------- UI/GameSettingsScreen.cpp | 5 ----- 3 files changed, 13 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index dd8e45681f91..da6e4c0d74c5 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -658,7 +658,6 @@ static ConfigSetting graphicsSettings[] = { ReportedConfigSetting("BloomHack", &g_Config.iBloomHack, 0, true, true), // Not really a graphics setting... - ReportedConfigSetting("TimerHack", &g_Config.bTimerHack, &DefaultTimerHack, true, true), ReportedConfigSetting("SplineBezierQuality", &g_Config.iSplineBezierQuality, 2, true, true), ReportedConfigSetting("HardwareTessellation", &g_Config.bHardwareTessellation, false, true, true), ReportedConfigSetting("PostShader", &g_Config.sPostShaderName, "Off", true, true), diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 150f5599eade..0e80ddc3a7d7 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -120,15 +120,8 @@ u64 GetGlobalTimeUsScaled() { s64 ticksSinceLast = GetTicks() - lastGlobalTimeTicks; int freq = GetClockFrequencyMHz(); - if (g_Config.bTimerHack) { - float vps; - __DisplayGetVPS(&vps); - if (vps > 4.0f) - freq *= (vps / 59.94f); - } s64 usSinceLast = ticksSinceLast / freq; return lastGlobalTimeUs + usSinceLast; - } u64 GetGlobalTimeUs() diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index c3b98df7a152..643526d6d62b 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -461,11 +461,6 @@ void GameSettingsScreen::CreateViews() { #endif graphicsSettings->Add(new ItemHeader(gr->T("Hack Settings", "Hack Settings (these WILL cause glitches)"))); - CheckBox *timerHack = graphicsSettings->Add(new CheckBox(&g_Config.bTimerHack, gr->T("Timer Hack"))); - timerHack->OnClick.Add([=](EventParams &e) { - settingInfo_->Show(gr->T("TimerHack Tip", "Changes game clock based on emu speed, may break games"), e.v); - return UI::EVENT_CONTINUE; - }); CheckBox *stencilTest = graphicsSettings->Add(new CheckBox(&g_Config.bDisableStencilTest, gr->T("Disable Stencil Test"))); stencilTest->SetDisabledPtr(&g_Config.bSoftwareRendering); From ee88bc79ffcee4cb19a49336533b8dd0ff831f3d Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Fri, 14 Dec 2018 16:14:43 +0100 Subject: [PATCH 2/2] Oops, x2 --- Core/Config.h | 1 - Core/Reporting.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/Core/Config.h b/Core/Config.h index 311516d7695d..55cf03b3d224 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -186,7 +186,6 @@ struct Config { int iCwCheatRefreshRate; bool bDisableStencilTest; int iBloomHack; //0 = off, 1 = safe, 2 = balanced, 3 = aggressive - bool bTimerHack; bool bBlockTransferGPU; bool bDisableSlowFramebufEffects; bool bFragmentTestCache; diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index a927c55510a1..6aeeadfbc336 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -458,8 +458,6 @@ namespace Reporting bool IsSupported() { // Disabled when using certain hacks, because they make for poor reports. - if (g_Config.bTimerHack) - return false; if (CheatsInEffect()) return false; if (g_Config.iLockedCPUSpeed != 0)