diff options
| author | bunnei <bunneidev@gmail.com> | 2022-07-31 23:47:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-31 23:47:43 +0200 |
| commit | 5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d (patch) | |
| tree | 0bbd8d3e9e8ac1754df17768a7fa7fd14568b77c | |
| parent | Merge pull request #8622 from liamwhite/progress (diff) | |
| parent | video_core: stop waiting for shader compilation on user cancel (diff) | |
| download | yuzu-5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d.tar yuzu-5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d.tar.gz yuzu-5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d.tar.bz2 yuzu-5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d.tar.lz yuzu-5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d.tar.xz yuzu-5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d.tar.zst yuzu-5ae0e5ba67ea680c4b36b4b33d562a2f8d47fc8d.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(); |