Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move the menu frame timing to the emuthread, fix hang on change backend

Browse source
This commit is contained in:
Henrik Rydgård 2023-09-29 19:16:06 +02:00
parent da801033f5
commit b8baff712b
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
SDL/SDLMain.cpp
View file

@ -669,7 +669,17 @@ static void EmuThreadFunc(GraphicsContext *graphicsContext) {
NativeInitGraphics(graphicsContext);
while (emuThreadState != (int)EmuThreadState::QUIT_REQUESTED) {
double startTime = time_now_d();
UpdateRunLoop(graphicsContext);
// Simple throttling to not burn the GPU in the menu.
if (GetUIState() != UISTATE_INGAME || !PSP_IsInited()) {
double diffTime = time_now_d() - startTime;
int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);
if (sleepTime > 0)
sleep_ms(sleepTime);
}
}
emuThreadState = (int)EmuThreadState::STOPPED;
graphicsContext->StopThread();
@ -1453,7 +1463,9 @@ int main(int argc, char *argv[]) {
// setup menu items for macOS
initializeOSXExtras();
#endif
bool waitOnExit = g_Config.iGPUBackend == (int)GPUBackend::OPENGL;
if (!mainThreadIsRender) {
// We should only be a message pump
while (true) {
@ -1465,8 +1477,6 @@ int main(int argc, char *argv[]) {
break;
}
} else while (true) {
double startTime = time_now_d();
inputTracker.TranslateMouseWheel();
{
@ -1530,23 +1540,17 @@ int main(int argc, char *argv[]) {
EmuThreadStart(graphicsContext);
graphicsContext->ThreadStart();
}
// Simple throttling to not burn the GPU in the menu.
if (GetUIState() != UISTATE_INGAME || !PSP_IsInited() || renderThreadPaused) {
double diffTime = time_now_d() - startTime;
int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);
if (sleepTime > 0)
sleep_ms(sleepTime);
}
}
EmuThreadStop("shutdown");
if (g_Config.iGPUBackend == (int)GPUBackend::OPENGL) {
if (waitOnExit) {
while (graphicsContext->ThreadFrame()) {
// Need to keep eating frames to allow the EmuThread to exit correctly.
continue;
}
}
EmuThreadJoin();
delete joystick;