preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-12 00:59:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2757 from thedax/master

Browse Source 
SpeedToggle button: Switch from tri-state to dual-state(standard/fixed).
This commit is contained in:
Henrik Rydgård committed 2013-07-11 13:39:58 -07:00
2 parents 1fdebd53e1 9af456a179
commit 415afa98d4
2 files changed
+2 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/GLES/DisplayListInterpreter.cpp
+1 -1
View File
@@ -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) {
UI/EmuScreen.cpp
+1 -5
View File
@@ -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);
}
@@ -433,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 != 1) {
PSP_CoreParameter().fpsLimit = 0;
}