summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2020-07-16 10:51:32 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2020-07-17 06:26:18 +0200
commit85b591f6f073caa0c36f4e13f63069787b44b487 (patch)
treeda98910b6af8a4331ad752496929ebeab4a3d8cf /src
parentUse conditional var (diff)
downloadyuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar
yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar.gz
yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar.bz2
yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar.lz
yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar.xz
yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar.zst
yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/async_shaders.cpp1
-rw-r--r--src/yuzu/configuration/config.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/shader/async_shaders.cpp b/src/video_core/shader/async_shaders.cpp
index 84d86c32f..64fad46e7 100644
--- a/src/video_core/shader/async_shaders.cpp
+++ b/src/video_core/shader/async_shaders.cpp
@@ -36,6 +36,7 @@ void AsyncShaders::AllocateWorkers(std::size_t num_workers) {
void AsyncShaders::FreeWorkers() {
// Mark all threads to quit
is_thread_exiting.store(true);
+ cv.notify_all();
for (auto& thread : worker_threads) {
thread.join();
}
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 4fef60fb2..805bb954b 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -1149,8 +1149,6 @@ void Config::SaveRendererValues() {
Settings::values.use_assembly_shaders, false);
WriteSettingGlobal(QStringLiteral("use_asynchronous_shaders"),
Settings::values.use_asynchronous_shaders, false);
- WriteSettingGlobal(QStringLiteral("use_asynchronous_shaders"),
- Settings::values.use_asynchronous_shaders, false);
WriteSettingGlobal(QStringLiteral("use_fast_gpu_time"), Settings::values.use_fast_gpu_time,
true);
WriteSettingGlobal(QStringLiteral("force_30fps_mode"), Settings::values.force_30fps_mode,