Skip to content
Snippets Groups Projects
Commit ab63a193 authored by ameerj's avatar ameerj
Browse files

video_core: Fix jthread related hangs when stopping emulation

jthread on some compilers is more picky when it comes to the order in which objects are destroyed.
parent 17bf40f4
No related branches found
No related tags found
No related merge requests found
......@@ -305,7 +305,6 @@ struct System::Impl {
is_powered_on = false;
exit_lock = false;
gpu_core.reset();
services.reset();
service_manager.reset();
cheat_engine.reset();
......@@ -315,6 +314,7 @@ struct System::Impl {
core_timing.Shutdown();
app_loader.reset();
perf_stats.reset();
gpu_core.reset();
kernel.Shutdown();
memory.Reset();
applet_manager.ClearAll();
......
......@@ -212,7 +212,6 @@ private:
vk::CommandBuffer current_cmdbuf;
std::unique_ptr<CommandChunk> chunk;
std::jthread worker_thread;
State state;
......@@ -226,6 +225,7 @@ private:
std::mutex work_mutex;
std::condition_variable_any work_cv;
std::condition_variable wait_cv;
std::jthread worker_thread;
};
} // namespace Vulkan
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment