From fc013d88cb9c1fd6ba2ada03aba2822419831584 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Fri, 29 Jul 2022 23:33:40 -0400
Subject: [PATCH] video_core: stop waiting for shader compilation on user
cancel
---
src/video_core/renderer_opengl/gl_shader_cache.cpp | 2 +-
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 07d4b7cf02..1ad56d9e7a 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 09e035799a..43cc94fab2 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();