diff options
| author | 2020-07-16 18:51:32 +1000 | |
|---|---|---|
| committer | 2020-07-17 14:26:18 +1000 | |
| commit | 85b591f6f073caa0c36f4e13f63069787b44b487 (patch) | |
| tree | da98910b6af8a4331ad752496929ebeab4a3d8cf | |
| parent | Use conditional var (diff) | |
| download | yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar.gz yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.tar.xz yuzu-85b591f6f073caa0c36f4e13f63069787b44b487.zip | |
Remove duplicate config
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/shader/async_shaders.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 2 |
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) { | |||
| 36 | void AsyncShaders::FreeWorkers() { | 36 | void AsyncShaders::FreeWorkers() { |
| 37 | // Mark all threads to quit | 37 | // Mark all threads to quit |
| 38 | is_thread_exiting.store(true); | 38 | is_thread_exiting.store(true); |
| 39 | cv.notify_all(); | ||
| 39 | for (auto& thread : worker_threads) { | 40 | for (auto& thread : worker_threads) { |
| 40 | thread.join(); | 41 | thread.join(); |
| 41 | } | 42 | } |
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() { | |||
| 1149 | Settings::values.use_assembly_shaders, false); | 1149 | Settings::values.use_assembly_shaders, false); |
| 1150 | WriteSettingGlobal(QStringLiteral("use_asynchronous_shaders"), | 1150 | WriteSettingGlobal(QStringLiteral("use_asynchronous_shaders"), |
| 1151 | Settings::values.use_asynchronous_shaders, false); | 1151 | Settings::values.use_asynchronous_shaders, false); |
| 1152 | WriteSettingGlobal(QStringLiteral("use_asynchronous_shaders"), | ||
| 1153 | Settings::values.use_asynchronous_shaders, false); | ||
| 1154 | WriteSettingGlobal(QStringLiteral("use_fast_gpu_time"), Settings::values.use_fast_gpu_time, | 1152 | WriteSettingGlobal(QStringLiteral("use_fast_gpu_time"), Settings::values.use_fast_gpu_time, |
| 1155 | true); | 1153 | true); |
| 1156 | WriteSettingGlobal(QStringLiteral("force_30fps_mode"), Settings::values.force_30fps_mode, | 1154 | WriteSettingGlobal(QStringLiteral("force_30fps_mode"), Settings::values.force_30fps_mode, |