Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22142 from darkguy2008/libretro-pause-handshake

Browse Source 
libretro: restore emu-thread pause handshake so retro_serialize can't deadlock
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2026-08-25 17:36:58 +02:00
2 parents 4b57da4450 821c5b4534
commit a0c10a0ea6
2 files changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libretro/LibretroGraphicsContext.h
+1
View File
@@ -100,6 +100,7 @@ extern retro_hw_context_type backend;
enum class EmuThreadState {
DISABLED,
RUNNING,
PAUSE_REQUESTED,
PAUSED,
QUIT_REQUESTED,
STOPPED,
libretro/libretro.cpp
+6 -2
View File
@@ -1392,6 +1392,9 @@ namespace Libretro {
case EmuThreadState::RUNNING:
EmuFrame();
break;
case EmuThreadState::PAUSE_REQUESTED:
emuThreadState = EmuThreadState::PAUSED;
[[fallthrough]];
case EmuThreadState::PAUSED:
sleep_ms(1, "libretro-paused");
break;
@@ -1441,7 +1444,7 @@ namespace Libretro {
if (emuThreadState != EmuThreadState::RUNNING)
return;
emuThreadState = EmuThreadState::PAUSED;
emuThreadState = EmuThreadState::PAUSE_REQUESTED;
// Is this safe?
ctx->ThreadFrame(); // Eat 1 frame
@@ -1715,7 +1718,8 @@ void retro_run(void) {
// Handle thread pumping.
if (useEmuThread) {
if (emuThreadState == EmuThreadState::PAUSED) {
if (emuThreadState == EmuThreadState::PAUSED ||
emuThreadState == EmuThreadState::PAUSE_REQUESTED) {
VsyncSwapIntervalDetect();
ctx->SwapBuffers();
return;