preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-04 11:45:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix OpenGL exit hang on Windows

Browse Source
This commit is contained in:
Henrik Rydgård
2025-08-31 11:37:05 +02:00
parent 9218fe9b59
commit 7fe30d6f2d
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Windows/EmuThread.cpp
+15 -11
View File
@@ -40,7 +40,7 @@ enum class EmuThreadState {
};
static std::thread emuThread;
static std::atomic<int> emuThreadState((int)EmuThreadState::DISABLED);
static std::atomic<EmuThreadState> g_emuThreadState(EmuThreadState::DISABLED);
static std::thread mainThread;
static bool useEmuThread;
@@ -78,11 +78,11 @@ static void EmuThreadFunc(GraphicsContext *graphicsContext) {
// There's no real requirement that NativeInit happen on this thread.
// We just call the update/render loop here.
emuThreadState = (int)EmuThreadState::RUNNING;
g_emuThreadState = EmuThreadState::RUNNING;
NativeInitGraphics(graphicsContext);
while (emuThreadState != (int)EmuThreadState::QUIT_REQUESTED) {
while (g_emuThreadState != EmuThreadState::QUIT_REQUESTED) {
// We're here again, so the game quit. Restart Run() which controls the UI.
// This way they can load a new game.
if (!Core_IsActive()) {
@@ -93,24 +93,25 @@ static void EmuThreadFunc(GraphicsContext *graphicsContext) {
NativeFrame(graphicsContext);
if (GetUIState() == UISTATE_EXIT) {
emuThreadState = (int)EmuThreadState::QUIT_REQUESTED;
g_emuThreadState = EmuThreadState::QUIT_REQUESTED;
}
}
emuThreadState = (int)EmuThreadState::STOPPED;
g_emuThreadState = EmuThreadState::STOPPED;
NativeShutdownGraphics();
}
static void EmuThreadStart(GraphicsContext *graphicsContext) {
emuThreadState = (int)EmuThreadState::START_REQUESTED;
g_emuThreadState = EmuThreadState::START_REQUESTED;
emuThread = std::thread(&EmuThreadFunc, graphicsContext);
}
static void EmuThreadStop() {
if (emuThreadState != (int)EmuThreadState::QUIT_REQUESTED &&
emuThreadState != (int)EmuThreadState::STOPPED) {
emuThreadState = (int)EmuThreadState::QUIT_REQUESTED;
const EmuThreadState state = g_emuThreadState;
if (state != EmuThreadState::QUIT_REQUESTED &&
state != EmuThreadState::STOPPED) {
g_emuThreadState = EmuThreadState::QUIT_REQUESTED;
}
}
@@ -273,7 +274,10 @@ void MainThreadFunc() {
}
if (useEmuThread) {
while (emuThreadState != (int)EmuThreadState::DISABLED) {
while (true) {
if (equals_any(g_emuThreadState, EmuThreadState::QUIT_REQUESTED, EmuThreadState::STOPPED)) {
break;
}
graphicsContext->ThreadFrame(true);
if (GetUIState() == UISTATE_EXIT) {
break;
@@ -302,7 +306,7 @@ void MainThreadFunc() {
EmuThreadStop();
graphicsContext->ThreadFrameUntilCondition([] {
// Need to keep eating frames to allow the EmuThread to exit correctly.
return emuThreadState == (int)EmuThreadState::STOPPED;
return g_emuThreadState == EmuThreadState::STOPPED;
});
EmuThreadJoin();
}