summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar ameerj2021-09-23 20:34:02 -0400
committerGravatar ameerj2021-09-23 20:34:02 -0400
commitab63a193d7e47fc093896d051f9ebf727d3b86d8 (patch)
tree89b2f05222f37f356777b99bcbca54dd1d228566 /src/video_core
parentMerge pull request #7045 from behunin/patch-1 (diff)
downloadyuzu-ab63a193d7e47fc093896d051f9ebf727d3b86d8.tar.gz
yuzu-ab63a193d7e47fc093896d051f9ebf727d3b86d8.tar.xz
yuzu-ab63a193d7e47fc093896d051f9ebf727d3b86d8.zip
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.
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_vulkan/vk_scheduler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_vulkan/vk_scheduler.h b/src/video_core/renderer_vulkan/vk_scheduler.h
index bd22e4e83..85fc1712f 100644
--- a/src/video_core/renderer_vulkan/vk_scheduler.h
+++ b/src/video_core/renderer_vulkan/vk_scheduler.h
@@ -212,7 +212,6 @@ private:
212 vk::CommandBuffer current_cmdbuf; 212 vk::CommandBuffer current_cmdbuf;
213 213
214 std::unique_ptr<CommandChunk> chunk; 214 std::unique_ptr<CommandChunk> chunk;
215 std::jthread worker_thread;
216 215
217 State state; 216 State state;
218 217
@@ -226,6 +225,7 @@ private:
226 std::mutex work_mutex; 225 std::mutex work_mutex;
227 std::condition_variable_any work_cv; 226 std::condition_variable_any work_cv;
228 std::condition_variable wait_cv; 227 std::condition_variable wait_cv;
228 std::jthread worker_thread;
229}; 229};
230 230
231} // namespace Vulkan 231} // namespace Vulkan