summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-10-30 18:23:57 +0100
committerGitHub <noreply@github.com>2022-10-30 18:23:57 +0100
commite09756b2dfe58d14572537bc94c37bdc664c5346 (patch)
treebda67242a6ad2cc3c30040d9700efc3a74bd66d2
parentMerge pull request #9091 from Docteh/what_compat_list (diff)
parentkernel: reinitialize after dram layout change (diff)
downloadyuzu-e09756b2dfe58d14572537bc94c37bdc664c5346.tar
yuzu-e09756b2dfe58d14572537bc94c37bdc664c5346.tar.gz
yuzu-e09756b2dfe58d14572537bc94c37bdc664c5346.tar.bz2
yuzu-e09756b2dfe58d14572537bc94c37bdc664c5346.tar.lz
yuzu-e09756b2dfe58d14572537bc94c37bdc664c5346.tar.xz
yuzu-e09756b2dfe58d14572537bc94c37bdc664c5346.tar.zst
yuzu-e09756b2dfe58d14572537bc94c37bdc664c5346.zip
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 40a610435..d8934be52 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -137,6 +137,7 @@ struct System::Impl {
device_memory = std::make_unique<Core::DeviceMemory>();
is_multicore = Settings::values.use_multi_core.GetValue();
+ extended_memory_layout = Settings::values.use_extended_memory_layout.GetValue();
core_timing.SetMulticore(is_multicore);
core_timing.Initialize([&system]() { system.RegisterHostThread(); });
@@ -166,13 +167,18 @@ struct System::Impl {
}
void ReinitializeIfNecessary(System& system) {
- if (is_multicore == Settings::values.use_multi_core.GetValue()) {
+ const bool must_reinitialize =
+ is_multicore != Settings::values.use_multi_core.GetValue() ||
+ extended_memory_layout != Settings::values.use_extended_memory_layout.GetValue();
+
+ if (!must_reinitialize) {
return;
}
LOG_DEBUG(Kernel, "Re-initializing");
is_multicore = Settings::values.use_multi_core.GetValue();
+ extended_memory_layout = Settings::values.use_extended_memory_layout.GetValue();
Initialize(system);
}
@@ -521,6 +527,7 @@ struct System::Impl {
bool is_multicore{};
bool is_async_gpu{};
+ bool extended_memory_layout{};
ExecuteProgramCallback execute_program_callback;
ExitCallback exit_callback;