mirror of
https://github.com/yuzu-emu/yuzu-mainline
synced 2024-11-22 15:03:45 +00:00
Merge pull request #8678 from liamwhite/stop-waiting
video_core: stop waiting for shader compilation on user cancel
This commit is contained in:
commit
5ae0e5ba67
2 changed files with 2 additions and 2 deletions
|
@ -299,7 +299,7 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading,
|
||||||
state.has_loaded = true;
|
state.has_loaded = true;
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
|
|
||||||
workers->WaitForRequests();
|
workers->WaitForRequests(stop_loading);
|
||||||
if (!use_asynchronous_shaders) {
|
if (!use_asynchronous_shaders) {
|
||||||
workers.reset();
|
workers.reset();
|
||||||
}
|
}
|
||||||
|
|
|
@ -452,7 +452,7 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
|
||||||
state.has_loaded = true;
|
state.has_loaded = true;
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
|
|
||||||
workers.WaitForRequests();
|
workers.WaitForRequests(stop_loading);
|
||||||
|
|
||||||
if (state.statistics) {
|
if (state.statistics) {
|
||||||
state.statistics->Report();
|
state.statistics->Report();
|
||||||
|
|
Loading…
Reference in a new issue