yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-12 17:54:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7078 from ameerj/vc-jthread-fixes

Browse Source 
video_core: Fix jthread related hangs when stopping emulation
This commit is contained in:
Morph 2021-09-26 16:40:13 -04:00 committed by GitHub
commit 5114819b6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.cpp
View File

@ -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();

2
src/video_core/renderer_vulkan/vk_scheduler.h
View File

@ -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