diff options
author | Mai M <mathew1800@gmail.com> | 2021-06-23 08:35:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-23 08:35:42 +0200 |
commit | 20f474b09ab503607fab651342bcee433d117c80 (patch) | |
tree | e9f506ad8d9a5366065dd83797813a504cbaba3e /src/video_core/renderer_opengl/gl_shader_cache.cpp | |
parent | Merge pull request #6514 from OZtistic/master (diff) | |
parent | bootmanager: Use std::stop_source for stopping emulation (diff) | |
download | yuzu-20f474b09ab503607fab651342bcee433d117c80.tar yuzu-20f474b09ab503607fab651342bcee433d117c80.tar.gz yuzu-20f474b09ab503607fab651342bcee433d117c80.tar.bz2 yuzu-20f474b09ab503607fab651342bcee433d117c80.tar.lz yuzu-20f474b09ab503607fab651342bcee433d117c80.tar.xz yuzu-20f474b09ab503607fab651342bcee433d117c80.tar.zst yuzu-20f474b09ab503607fab651342bcee433d117c80.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_cache.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 5cf7cd151..5a01c59ec 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -331,7 +331,7 @@ ShaderCacheOpenGL::ShaderCacheOpenGL(RasterizerOpenGL& rasterizer_, ShaderCacheOpenGL::~ShaderCacheOpenGL() = default; -void ShaderCacheOpenGL::LoadDiskCache(u64 title_id, const std::atomic_bool& stop_loading, +void ShaderCacheOpenGL::LoadDiskCache(u64 title_id, std::stop_token stop_loading, const VideoCore::DiskResourceLoadCallback& callback) { disk_cache.BindTitleID(title_id); const std::optional transferable = disk_cache.LoadTransferable(); @@ -372,7 +372,7 @@ void ShaderCacheOpenGL::LoadDiskCache(u64 title_id, const std::atomic_bool& stop const auto scope = context->Acquire(); for (std::size_t i = begin; i < end; ++i) { - if (stop_loading) { + if (stop_loading.stop_requested()) { return; } const auto& entry = (*transferable)[i]; @@ -435,7 +435,7 @@ void ShaderCacheOpenGL::LoadDiskCache(u64 title_id, const std::atomic_bool& stop precompiled_cache_altered = true; return; } - if (stop_loading) { + if (stop_loading.stop_requested()) { return; } |