diff options
author | bunnei <bunneidev@gmail.com> | 2022-02-26 01:41:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-26 01:41:08 -0800 |
commit | 20e9501b0d0d18b6b215f2f3ed092a3646267bd1 (patch) | |
tree | cd90b946482d00c5431c13b165f28d803cf54f59 /src/yuzu/configuration/configure_general.cpp | |
parent | 56d9052b73a400a406de062ee797d0a96c18d42c (diff) | |
parent | 71f62a346d8987302624873b75d1c64903341aa3 (diff) |
Merge pull request #7932 from bunnei/extended-mem-layout
Add extended memory layout (6GB) support and improve KResourceLimit management
Diffstat (limited to 'src/yuzu/configuration/configure_general.cpp')
-rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 978a29fe6..08d5444ec 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -42,6 +42,9 @@ void ConfigureGeneral::SetConfiguration() { ui->use_multi_core->setEnabled(runtime_lock); ui->use_multi_core->setChecked(Settings::values.use_multi_core.GetValue()); + ui->use_extended_memory_layout->setEnabled(runtime_lock); + ui->use_extended_memory_layout->setChecked( + Settings::values.use_extended_memory_layout.GetValue()); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue()); ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot.GetValue()); @@ -91,6 +94,9 @@ void ConfigureGeneral::ResetDefaults() { void ConfigureGeneral::ApplyConfiguration() { ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, ui->use_multi_core, use_multi_core); + ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_extended_memory_layout, + ui->use_extended_memory_layout, + use_extended_memory_layout); if (Settings::IsConfiguringGlobal()) { UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); @@ -160,6 +166,9 @@ void ConfigureGeneral::SetupPerGameUI() { Settings::values.use_speed_limit, use_speed_limit); ConfigurationShared::SetColoredTristate(ui->use_multi_core, Settings::values.use_multi_core, use_multi_core); + ConfigurationShared::SetColoredTristate(ui->use_extended_memory_layout, + Settings::values.use_extended_memory_layout, + use_extended_memory_layout); connect(ui->toggle_speed_limit, &QCheckBox::clicked, ui->speed_limit, [this]() { ui->speed_limit->setEnabled(ui->toggle_speed_limit->isChecked() && |