diff options
Diffstat (limited to 'src/citra_qt/configuration')
| -rw-r--r-- | src/citra_qt/configuration/config.cpp | 5 | ||||
| -rw-r--r-- | src/citra_qt/configuration/configure_general.cpp | 7 | ||||
| -rw-r--r-- | src/citra_qt/configuration/configure_general.ui | 13 |
3 files changed, 17 insertions, 8 deletions
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index c268e0068..68d565c39 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -67,7 +67,8 @@ void Config::ReadValues() { qt_config->endGroup(); qt_config->beginGroup("Core"); - Settings::values.use_cpu_jit = qt_config->value("use_cpu_jit", true).toBool(); + Settings::values.cpu_core = + static_cast<Settings::CpuCore>(qt_config->value("cpu_core", 1).toInt()); qt_config->endGroup(); qt_config->beginGroup("Renderer"); @@ -207,7 +208,7 @@ void Config::SaveValues() { qt_config->endGroup(); qt_config->beginGroup("Core"); - qt_config->setValue("use_cpu_jit", Settings::values.use_cpu_jit); + qt_config->setValue("cpu_core", static_cast<int>(Settings::values.cpu_core)); qt_config->endGroup(); qt_config->beginGroup("Renderer"); diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index 939379717..0de27aa8b 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -19,7 +19,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) this->setConfiguration(); - ui->toggle_cpu_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn()); + ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn()); } ConfigureGeneral::~ConfigureGeneral() {} @@ -27,12 +27,12 @@ ConfigureGeneral::~ConfigureGeneral() {} void ConfigureGeneral::setConfiguration() { ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); - ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit); // The first item is "auto-select" with actual value -1, so plus one here will do the trick ui->region_combobox->setCurrentIndex(Settings::values.region_value + 1); ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); + ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core)); } void ConfigureGeneral::applyConfiguration() { @@ -41,6 +41,7 @@ void ConfigureGeneral::applyConfiguration() { UISettings::values.theme = ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); Settings::values.region_value = ui->region_combobox->currentIndex() - 1; - Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked(); + Settings::values.cpu_core = + static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex()); Settings::Apply(); } diff --git a/src/citra_qt/configuration/configure_general.ui b/src/citra_qt/configuration/configure_general.ui index eedf2cbb0..e88c37936 100644 --- a/src/citra_qt/configuration/configure_general.ui +++ b/src/citra_qt/configuration/configure_general.ui @@ -46,16 +46,23 @@ <item> <widget class="QGroupBox" name="groupBox_2"> <property name="title"> - <string>Performance</string> + <string>CPU Core</string> </property> <layout class="QHBoxLayout" name="horizontalLayout_7"> <item> <layout class="QVBoxLayout" name="verticalLayout_5"> <item> - <widget class="QCheckBox" name="toggle_cpu_jit"> + <widget class="QComboBox" name="cpu_core_combobox"> + <item> <property name="text"> - <string>Enable CPU JIT</string> + <string>Unicorn</string> </property> + </item> + <item> + <property name="text"> + <string>Dynarmic</string> + </property> + </item> </widget> </item> </layout> |