summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar fearlessTobi2019-07-04 14:48:08 +0200
committerGravatar fearlessTobi2019-07-04 14:48:08 +0200
commit447bdac298c8a4d71b95996ba44efa9a5fd39e84 (patch)
tree7958491f46776eedc810bb65d76ca1a31232e7d3 /src
parentMerge pull request #2604 from ogniK5377/INotificationService (diff)
downloadyuzu-447bdac298c8a4d71b95996ba44efa9a5fd39e84.tar.gz
yuzu-447bdac298c8a4d71b95996ba44efa9a5fd39e84.tar.xz
yuzu-447bdac298c8a4d71b95996ba44efa9a5fd39e84.zip
yuzu: Remove CPU Jit setting from the UI
A normal user shouldn't change this, as it will slow down the emulation and can lead to bugs or crashes. The renaming is done in order to prevent users from leaving this on without a way to turn it off from the UI.
Diffstat (limited to 'src')
-rw-r--r--src/core/core_cpu.cpp4
-rw-r--r--src/core/settings.cpp2
-rw-r--r--src/core/settings.h2
-rw-r--r--src/core/telemetry_session.cpp2
-rw-r--r--src/yuzu/configuration/config.cpp5
-rw-r--r--src/yuzu/configuration/configure_general.cpp5
-rw-r--r--src/yuzu/configuration/configure_general.ui20
-rw-r--r--src/yuzu_cmd/config.cpp2
-rw-r--r--src/yuzu_cmd/default_ini.h2
-rw-r--r--src/yuzu_tester/config.cpp2
-rw-r--r--src/yuzu_tester/default_ini.h2
11 files changed, 12 insertions, 36 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp
index ba63c3e61..99b7d387d 100644
--- a/src/core/core_cpu.cpp
+++ b/src/core/core_cpu.cpp
@@ -53,7 +53,7 @@ bool CpuBarrier::Rendezvous() {
53Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_barrier, 53Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_barrier,
54 std::size_t core_index) 54 std::size_t core_index)
55 : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} { 55 : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} {
56 if (Settings::values.use_cpu_jit) { 56 if (Settings::values.cpu_jit_enabled) {
57#ifdef ARCHITECTURE_x86_64 57#ifdef ARCHITECTURE_x86_64
58 arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index); 58 arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index);
59#else 59#else
@@ -70,7 +70,7 @@ Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_ba
70Cpu::~Cpu() = default; 70Cpu::~Cpu() = default;
71 71
72std::unique_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) { 72std::unique_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) {
73 if (Settings::values.use_cpu_jit) { 73 if (Settings::values.cpu_jit_enabled) {
74#ifdef ARCHITECTURE_x86_64 74#ifdef ARCHITECTURE_x86_64
75 return std::make_unique<DynarmicExclusiveMonitor>(num_cores); 75 return std::make_unique<DynarmicExclusiveMonitor>(num_cores);
76#else 76#else
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 6d32ebea3..63aa59690 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -85,7 +85,7 @@ void LogSettings() {
85 LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0)); 85 LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0));
86 LogSetting("System_CurrentUser", Settings::values.current_user); 86 LogSetting("System_CurrentUser", Settings::values.current_user);
87 LogSetting("System_LanguageIndex", Settings::values.language_index); 87 LogSetting("System_LanguageIndex", Settings::values.language_index);
88 LogSetting("Core_UseCpuJit", Settings::values.use_cpu_jit); 88 LogSetting("Core_CpuJitEnabled", Settings::values.cpu_jit_enabled);
89 LogSetting("Core_UseMultiCore", Settings::values.use_multi_core); 89 LogSetting("Core_UseMultiCore", Settings::values.use_multi_core);
90 LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor); 90 LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor);
91 LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit); 91 LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit);
diff --git a/src/core/settings.h b/src/core/settings.h
index e2ffcaaf7..d8e806a3c 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -378,7 +378,7 @@ struct Values {
378 std::atomic_bool is_device_reload_pending{true}; 378 std::atomic_bool is_device_reload_pending{true};
379 379
380 // Core 380 // Core
381 bool use_cpu_jit; 381 bool cpu_jit_enabled;
382 bool use_multi_core; 382 bool use_multi_core;
383 383
384 // Data Storage 384 // Data Storage
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 90d06830f..98f49042a 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -168,7 +168,7 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader) {
168 AddField(Telemetry::FieldType::UserConfig, "Audio_SinkId", Settings::values.sink_id); 168 AddField(Telemetry::FieldType::UserConfig, "Audio_SinkId", Settings::values.sink_id);
169 AddField(Telemetry::FieldType::UserConfig, "Audio_EnableAudioStretching", 169 AddField(Telemetry::FieldType::UserConfig, "Audio_EnableAudioStretching",
170 Settings::values.enable_audio_stretching); 170 Settings::values.enable_audio_stretching);
171 AddField(Telemetry::FieldType::UserConfig, "Core_UseCpuJit", Settings::values.use_cpu_jit); 171 AddField(Telemetry::FieldType::UserConfig, "Core_UseCpuJit", Settings::values.cpu_jit_enabled);
172 AddField(Telemetry::FieldType::UserConfig, "Core_UseMultiCore", 172 AddField(Telemetry::FieldType::UserConfig, "Core_UseMultiCore",
173 Settings::values.use_multi_core); 173 Settings::values.use_multi_core);
174 AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor", 174 AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor",
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 5a456e603..b2f80f8a8 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -436,7 +436,8 @@ void Config::ReadControlValues() {
436void Config::ReadCoreValues() { 436void Config::ReadCoreValues() {
437 qt_config->beginGroup(QStringLiteral("Core")); 437 qt_config->beginGroup(QStringLiteral("Core"));
438 438
439 Settings::values.use_cpu_jit = ReadSetting(QStringLiteral("use_cpu_jit"), true).toBool(); 439 Settings::values.cpu_jit_enabled =
440 ReadSetting(QStringLiteral("cpu_jit_enabled"), true).toBool();
440 Settings::values.use_multi_core = ReadSetting(QStringLiteral("use_multi_core"), false).toBool(); 441 Settings::values.use_multi_core = ReadSetting(QStringLiteral("use_multi_core"), false).toBool();
441 442
442 qt_config->endGroup(); 443 qt_config->endGroup();
@@ -829,7 +830,7 @@ void Config::SaveControlValues() {
829void Config::SaveCoreValues() { 830void Config::SaveCoreValues() {
830 qt_config->beginGroup(QStringLiteral("Core")); 831 qt_config->beginGroup(QStringLiteral("Core"));
831 832
832 WriteSetting(QStringLiteral("use_cpu_jit"), Settings::values.use_cpu_jit, true); 833 WriteSetting(QStringLiteral("cpu_jit_enabled"), Settings::values.cpu_jit_enabled, true);
833 WriteSetting(QStringLiteral("use_multi_core"), Settings::values.use_multi_core, false); 834 WriteSetting(QStringLiteral("use_multi_core"), Settings::values.use_multi_core, false);
834 835
835 qt_config->endGroup(); 836 qt_config->endGroup();
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 06d368dfc..7a6e921cd 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -22,8 +22,6 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
22 22
23 connect(ui->toggle_deepscan, &QCheckBox::stateChanged, this, 23 connect(ui->toggle_deepscan, &QCheckBox::stateChanged, this,
24 [] { UISettings::values.is_game_list_reload_pending.exchange(true); }); 24 [] { UISettings::values.is_game_list_reload_pending.exchange(true); });
25
26 ui->use_cpu_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn());
27} 25}
28 26
29ConfigureGeneral::~ConfigureGeneral() = default; 27ConfigureGeneral::~ConfigureGeneral() = default;
@@ -33,7 +31,6 @@ void ConfigureGeneral::SetConfiguration() {
33 ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); 31 ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
34 ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot); 32 ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot);
35 ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); 33 ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
36 ui->use_cpu_jit->setChecked(Settings::values.use_cpu_jit);
37} 34}
38 35
39void ConfigureGeneral::ApplyConfiguration() { 36void ConfigureGeneral::ApplyConfiguration() {
@@ -42,8 +39,6 @@ void ConfigureGeneral::ApplyConfiguration() {
42 UISettings::values.select_user_on_boot = ui->toggle_user_on_boot->isChecked(); 39 UISettings::values.select_user_on_boot = ui->toggle_user_on_boot->isChecked();
43 UISettings::values.theme = 40 UISettings::values.theme =
44 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); 41 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
45
46 Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked();
47} 42}
48 43
49void ConfigureGeneral::changeEvent(QEvent* event) { 44void ConfigureGeneral::changeEvent(QEvent* event) {
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index 1a5721fe7..184fdd329 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -51,26 +51,6 @@
51 </widget> 51 </widget>
52 </item> 52 </item>
53 <item> 53 <item>
54 <widget class="QGroupBox" name="PerformanceGroupBox">
55 <property name="title">
56 <string>Performance</string>
57 </property>
58 <layout class="QHBoxLayout" name="PerformanceHorizontalLayout">
59 <item>
60 <layout class="QVBoxLayout" name="PerformanceVerticalLayout">
61 <item>
62 <widget class="QCheckBox" name="use_cpu_jit">
63 <property name="text">
64 <string>Enable CPU JIT</string>
65 </property>
66 </widget>
67 </item>
68 </layout>
69 </item>
70 </layout>
71 </widget>
72 </item>
73 <item>
74 <widget class="QGroupBox" name="theme_group_box"> 54 <widget class="QGroupBox" name="theme_group_box">
75 <property name="title"> 55 <property name="title">
76 <string>Theme</string> 56 <string>Theme</string>
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 9ac92e937..5b7452e52 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -340,7 +340,7 @@ void Config::ReadValues() {
340 } 340 }
341 341
342 // Core 342 // Core
343 Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); 343 Settings::values.cpu_jit_enabled = sdl2_config->GetBoolean("Core", "cpu_jit_enabled", true);
344 Settings::values.use_multi_core = sdl2_config->GetBoolean("Core", "use_multi_core", false); 344 Settings::values.use_multi_core = sdl2_config->GetBoolean("Core", "use_multi_core", false);
345 345
346 // Renderer 346 // Renderer
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index 6538af098..0508fae9c 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -78,7 +78,7 @@ touch_device=
78[Core] 78[Core]
79# Whether to use the Just-In-Time (JIT) compiler for CPU emulation 79# Whether to use the Just-In-Time (JIT) compiler for CPU emulation
80# 0: Interpreter (slow), 1 (default): JIT (fast) 80# 0: Interpreter (slow), 1 (default): JIT (fast)
81use_cpu_jit = 81cpu_jit_enabled =
82 82
83# Whether to use multi-core for CPU emulation 83# Whether to use multi-core for CPU emulation
84# 0 (default): Disabled, 1: Enabled 84# 0 (default): Disabled, 1: Enabled
diff --git a/src/yuzu_tester/config.cpp b/src/yuzu_tester/config.cpp
index d7e0d408d..b96b7d279 100644
--- a/src/yuzu_tester/config.cpp
+++ b/src/yuzu_tester/config.cpp
@@ -114,7 +114,7 @@ void Config::ReadValues() {
114 } 114 }
115 115
116 // Core 116 // Core
117 Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); 117 Settings::values.cpu_jit_enabled = sdl2_config->GetBoolean("Core", "cpu_jit_enabled", true);
118 Settings::values.use_multi_core = sdl2_config->GetBoolean("Core", "use_multi_core", false); 118 Settings::values.use_multi_core = sdl2_config->GetBoolean("Core", "use_multi_core", false);
119 119
120 // Renderer 120 // Renderer
diff --git a/src/yuzu_tester/default_ini.h b/src/yuzu_tester/default_ini.h
index 46a9960cd..0f880d8c7 100644
--- a/src/yuzu_tester/default_ini.h
+++ b/src/yuzu_tester/default_ini.h
@@ -10,7 +10,7 @@ const char* sdl2_config_file = R"(
10[Core] 10[Core]
11# Whether to use the Just-In-Time (JIT) compiler for CPU emulation 11# Whether to use the Just-In-Time (JIT) compiler for CPU emulation
12# 0: Interpreter (slow), 1 (default): JIT (fast) 12# 0: Interpreter (slow), 1 (default): JIT (fast)
13use_cpu_jit = 13cpu_jit_enabled =
14 14
15# Whether to use multi-core for CPU emulation 15# Whether to use multi-core for CPU emulation
16# 0 (default): Disabled, 1: Enabled 16# 0 (default): Disabled, 1: Enabled