diff --git a/Core/Config.cpp b/Core/Config.cpp index 8cf4c91367..8b6edc4099 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -632,7 +632,6 @@ static ConfigSetting graphicsSettings[] = { #if defined(USING_WIN_UI) ConfigSetting("RestartRequired", &g_Config.bRestartRequired, false, false), #endif - ConfigSetting("RefreshAt60Hz", &g_Config.bRefreshAt60Hz, false, true, true), // Most low-performance (and many high performance) mobile GPUs do not support aniso anyway so defaulting to 4 is fine. ConfigSetting("AnisotropyLevel", &g_Config.iAnisotropyLevel, 4, true, true), diff --git a/Core/Config.h b/Core/Config.h index f1aefc4614..f77e6b41b8 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -186,7 +186,6 @@ public: bool bTexDeposterize; int iFpsLimit1; int iFpsLimit2; - bool bRefreshAt60Hz; int iMaxRecent; int iCurrentStateSlot; int iRewindFlipFrequency; diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 78d186f777..34f130575e 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -110,7 +110,7 @@ static bool wasPaused; static bool flippedThisFrame; // 1.001f to compensate for the classic 59.94 NTSC framerate that the PSP seems to have. -static const double timePerVblank = (g_Config.bRefreshAt60Hz ? 1.0f : 1.001f) / 60.0f; +static const double timePerVblank = 1.001f / 60.0f; // Don't include this in the state, time increases regardless of state. static double curFrameTime; @@ -952,7 +952,7 @@ u32 sceDisplaySetFramebuf(u32 topaddr, int linesize, int pixelformat, int sync) } // 1001 to account for NTSC timing (59.94 fps.) - u64 expected = msToCycles(g_Config.bRefreshAt60Hz ? 1000 : 1001) / 60 - LEEWAY_CYCLES_PER_FLIP; + u64 expected = msToCycles(1001) / 60 - LEEWAY_CYCLES_PER_FLIP; lastFlipCycles = now; nextFlipCycles = std::max(lastFlipCycles, nextFlipCycles) + expected; } @@ -1101,7 +1101,7 @@ static int sceDisplayGetAccumulatedHcount() { } static float sceDisplayGetFramePerSec() { - const static float framePerSec = g_Config.bRefreshAt60Hz ? 60.0f : 59.9400599f; + const static float framePerSec = 59.9400599f; VERBOSE_LOG(SCEDISPLAY,"%f=sceDisplayGetFramePerSec()", framePerSec); return framePerSec; // (9MHz * 1)/(525 * 286) } diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 05896221c2..9f19188ccd 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1425,7 +1425,6 @@ void OtherSettingsScreen::CreateViews() { list->Add(new CheckBox(&g_Config.bFrameSkipUnthrottle, gr->T("Frameskip unthrottle(good for CPU benchmark)"))); list->Add(new CheckBox(&g_Config.bShowFrameProfiler, gr->T("Display frame profiler(heavy!)"))); list->Add(new CheckBox(&g_Config.bSimpleFrameStats, gr->T("Display simple frame stats(heavy!)"))); - list->Add(new CheckBox(&g_Config.bRefreshAt60Hz, gr->T("Refresh at 60Hz(gamebreaking, but might be needed for NVidia stutter)"))); list->Add(new CheckBox(&g_Config.bSavestateScreenshotResLimit, gr->T("Limit resolution of savestates screenshots"))); list->Add(new CheckBox(&g_Config.bDiscordPresence, n->T("Send Discord(3rd party software) Presence information"))); }