diff options
| author | 2020-07-16 11:33:51 -0400 | |
|---|---|---|
| committer | 2020-07-16 11:33:51 -0400 | |
| commit | 2781201bfb507fb47a103843755ee0dc8e2e6d23 (patch) | |
| tree | 1974fd3d321308ff351db84bc74d17e98bb5d805 /src/core | |
| parent | Merge pull request #4297 from FearlessTobi/skip-profile-select (diff) | |
| parent | clang-format (diff) | |
| download | yuzu-2781201bfb507fb47a103843755ee0dc8e2e6d23.tar.gz yuzu-2781201bfb507fb47a103843755ee0dc8e2e6d23.tar.xz yuzu-2781201bfb507fb47a103843755ee0dc8e2e6d23.zip | |
Merge pull request #4337 from lat9nq/fix-per-game-async
main: Set async gpu properly after loading per-game setting
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/settings.cpp | 5 | ||||
| -rw-r--r-- | src/core/settings.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index d3886c4ec..64a3c69d3 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -184,4 +184,9 @@ void RestoreGlobalState() { | |||
| 184 | values.sound_index.SetGlobal(true); | 184 | values.sound_index.SetGlobal(true); |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | void Sanitize() { | ||
| 188 | values.use_asynchronous_gpu_emulation.SetValue( | ||
| 189 | values.use_asynchronous_gpu_emulation.GetValue() || values.use_multi_core.GetValue()); | ||
| 190 | } | ||
| 191 | |||
| 187 | } // namespace Settings | 192 | } // namespace Settings |
diff --git a/src/core/settings.h b/src/core/settings.h index 3eb336f75..a64debd25 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -526,4 +526,7 @@ void LogSettings(); | |||
| 526 | // Restore the global state of all applicable settings in the Values struct | 526 | // Restore the global state of all applicable settings in the Values struct |
| 527 | void RestoreGlobalState(); | 527 | void RestoreGlobalState(); |
| 528 | 528 | ||
| 529 | // Fixes settings that are known to cause issues with the emulator | ||
| 530 | void Sanitize(); | ||
| 531 | |||
| 529 | } // namespace Settings | 532 | } // namespace Settings |