diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-12 00:50:22 -0800 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2020-12-28 16:33:48 -0800 |
| commit | 916438a9de378f97129df7f5a979bb1a406cda9f (patch) | |
| tree | 0ed01b4d414cc649595db93111a973263a8922b3 /src/core | |
| parent | 40571c073faa02a6a4301e7f0ce365ef50a400aa (diff) | |
core: settings: Untangle multicore from asynchronous GPU.
- Now that GPU is always threaded, we can support multicore with synchronous GPU.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 2 | ||||
| -rw-r--r-- | src/core/settings.cpp | 5 | ||||
| -rw-r--r-- | src/core/settings.h | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 0961c0819b..4dc31ce669 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -159,7 +159,7 @@ struct System::Impl { device_memory = std::make_unique<Core::DeviceMemory>(); is_multicore = Settings::values.use_multi_core.GetValue(); - is_async_gpu = is_multicore || Settings::values.use_asynchronous_gpu_emulation.GetValue(); + is_async_gpu = Settings::values.use_asynchronous_gpu_emulation.GetValue(); kernel.SetMulticore(is_multicore); cpu_manager.SetMulticore(is_multicore); diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 47d9ecf9ab..39306509a7 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -148,9 +148,4 @@ void RestoreGlobalState(bool is_powered_on) { values.motion_enabled.SetGlobal(true); } -void Sanitize() { - values.use_asynchronous_gpu_emulation.SetValue( - values.use_asynchronous_gpu_emulation.GetValue() || values.use_multi_core.GetValue()); -} - } // namespace Settings diff --git a/src/core/settings.h b/src/core/settings.h index d5f8d2b7ed..0cd3c0c847 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -257,7 +257,4 @@ void LogSettings(); // Restore the global state of all applicable settings in the Values struct void RestoreGlobalState(bool is_powered_on); -// Fixes settings that are known to cause issues with the emulator -void Sanitize(); - } // namespace Settings |