Browse Source

Merge pull request #8678 from liamwhite/stop-waiting

video_core: stop waiting for shader compilation on user cancel
nce_cpp
bunnei 3 years ago
committed by GitHub
parent
commit
ceed22dbc4
  1. 2
      src/video_core/renderer_opengl/gl_shader_cache.cpp
  2. 2
      src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

2
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();
}

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

Loading…
Cancel
Save