octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8678 from liamwhite/stop-waiting 

video_core: stop waiting for shader compilation on user cancel
This commit is contained in:
bunnei 2022-07-31 14:47:43 -07:00 committed by GitHub
parent 3bbc1cf64c fc013d88cb
commit 5ae0e5ba67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_shader_cache.cpp
View File

@ -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
View File

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