From 0bc27f6d95e1ef509e6e8bed38136274a6d4a2dc Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 11 Jul 2013 15:43:51 -0400 Subject: [PATCH 1/3] Make SpeedToggle button switch between only fixed/standard. There's no need for it to be a tri-state button when there is a separate button for unlimited speed. --- UI/EmuScreen.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index b9468a1d82..53ddee6e36 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -191,10 +191,6 @@ void EmuScreen::onVKeyDown(int virtualKeyCode) { osm.Show(s->T("fixed", "Speed: fixed"), 1.0); } else if (PSP_CoreParameter().fpsLimit == 1) { - PSP_CoreParameter().fpsLimit = 2; - osm.Show(s->T("unlimited", "Speed: unlimited!"), 1.0, 0x50E0FF); - } - else if (PSP_CoreParameter().fpsLimit == 2) { PSP_CoreParameter().fpsLimit = 0; osm.Show(s->T("standard", "Speed: standard"), 1.0); } From 93e14040560cdfb0125d72de7096339590e02100 Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 11 Jul 2013 15:51:45 -0400 Subject: [PATCH 2/3] Remove dead code. --- GPU/GLES/DisplayListInterpreter.cpp | 2 +- UI/EmuScreen.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp index 4415569f89..00b15305a9 100644 --- a/GPU/GLES/DisplayListInterpreter.cpp +++ b/GPU/GLES/DisplayListInterpreter.cpp @@ -257,7 +257,7 @@ void GLES_GPU::DumpNextFrame() { void GLES_GPU::BeginFrame() { // Turn off vsync when unthrottled int desiredVSyncInterval = g_Config.iVSyncInterval; - if ((PSP_CoreParameter().unthrottle) || (PSP_CoreParameter().fpsLimit == 2) || (PSP_CoreParameter().fpsLimit == 1)) + if ((PSP_CoreParameter().unthrottle) || (PSP_CoreParameter().fpsLimit == 1)) desiredVSyncInterval = 0; if (desiredVSyncInterval != lastVsync_) { if (gl_extensions.EXT_swap_control_tear) { diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 53ddee6e36..6ffbd6353e 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -429,7 +429,7 @@ void EmuScreen::update(InputState &input) { } // Make sure fpsLimit starts at 0 - if (PSP_CoreParameter().fpsLimit != 0 && PSP_CoreParameter().fpsLimit != 1 && PSP_CoreParameter().fpsLimit != 2) { + if (PSP_CoreParameter().fpsLimit != 0) { PSP_CoreParameter().fpsLimit = 0; } From 9af456a179b760504643977dbb552ef18eba8aa6 Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 11 Jul 2013 15:55:33 -0400 Subject: [PATCH 3/3] Fix breaking the button.. :| --- UI/EmuScreen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 6ffbd6353e..18e3daed4b 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -429,7 +429,7 @@ void EmuScreen::update(InputState &input) { } // Make sure fpsLimit starts at 0 - if (PSP_CoreParameter().fpsLimit != 0) { + if (PSP_CoreParameter().fpsLimit != 0 && PSP_CoreParameter().fpsLimit != 1) { PSP_CoreParameter().fpsLimit = 0; }