ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NoGui: Fix renderer switching on Win32

This commit is contained in:
Connor McLaughlin 2022-08-26 21:59:17 +10:00
parent 73185bfb22
commit 215cfd3daf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/duckstation-nogui/nogui_host.cpp
View File

@ -91,7 +91,7 @@ static bool s_save_state_on_shutdown = false;
static bool s_was_paused_by_focus_loss = false; static bool s_was_paused_by_focus_loss = false;
static Threading::Thread s_cpu_thread; static Threading::Thread s_cpu_thread;
static Threading::KernelSemaphore s_host_display_created; static Threading::KernelSemaphore s_host_display_created_or_destroyed;
static std::atomic_bool s_running{false}; static std::atomic_bool s_running{false};
static std::mutex s_cpu_thread_events_mutex; static std::mutex s_cpu_thread_events_mutex;
static std::condition_variable s_cpu_thread_event_done; static std::condition_variable s_cpu_thread_event_done;
@ -726,10 +726,10 @@ bool NoGUIHost::AcquireHostDisplay(HostDisplay::RenderAPI api)
g_nogui_window->DestroyPlatformWindow(); g_nogui_window->DestroyPlatformWindow();
} }
s_host_display_created.Post(); s_host_display_created_or_destroyed.Post();
}); });
s_host_display_created.Wait(); s_host_display_created_or_destroyed.Wait();
if (!g_host_display) if (!g_host_display)
{ {
@ -781,7 +781,11 @@ void NoGUIHost::ReleaseHostDisplay()
ImGuiManager::Shutdown(); ImGuiManager::Shutdown();
g_host_display->DestroyRenderDevice(); g_host_display->DestroyRenderDevice();
g_host_display.reset(); g_host_display.reset();
g_nogui_window->ExecuteInMessageLoop([]() { g_nogui_window->DestroyPlatformWindow(); }); g_nogui_window->ExecuteInMessageLoop([]() {
g_nogui_window->DestroyPlatformWindow();
s_host_display_created_or_destroyed.Post();
});
s_host_display_created_or_destroyed.Wait();
} }
void Host::ReleaseHostDisplay() void Host::ReleaseHostDisplay()