Browse Source
Merge pull request #8678 from liamwhite/stop-waiting
video_core: stop waiting for shader compilation on user cancel
pull/15/merge
bunnei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
src/video_core/renderer_opengl/gl_shader_cache.cpp
-
src/video_core/renderer_vulkan/vk_pipeline_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(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
|