diff options
| author | Liam <byteslice@airmail.cc> | 2022-07-30 05:33:40 +0200 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-07-30 05:33:40 +0200 |
| commit | fc013d88cb9c1fd6ba2ada03aba2822419831584 (patch) | |
| tree | ff3090354d8eb23c0ea3dc840045949f1089a87c | |
| parent | Merge pull request #8665 from liamwhite/github-is-dumb (diff) | |
| download | yuzu-fc013d88cb9c1fd6ba2ada03aba2822419831584.tar yuzu-fc013d88cb9c1fd6ba2ada03aba2822419831584.tar.gz yuzu-fc013d88cb9c1fd6ba2ada03aba2822419831584.tar.bz2 yuzu-fc013d88cb9c1fd6ba2ada03aba2822419831584.tar.lz yuzu-fc013d88cb9c1fd6ba2ada03aba2822419831584.tar.xz yuzu-fc013d88cb9c1fd6ba2ada03aba2822419831584.tar.zst yuzu-fc013d88cb9c1fd6ba2ada03aba2822419831584.zip | |
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 07d4b7cf0..1ad56d9e7 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -299,7 +299,7 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading, state.has_loaded = true; lock.unlock(); - workers->WaitForRequests(); + workers->WaitForRequests(stop_loading); if (!use_asynchronous_shaders) { workers.reset(); } diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 09e035799..43cc94fab 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -452,7 +452,7 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading state.has_loaded = true; lock.unlock(); - workers.WaitForRequests(); + workers.WaitForRequests(stop_loading); if (state.statistics) { state.statistics->Report(); |