diff options
| author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2019-07-04 21:33:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 21:33:59 +0200 |
| commit | 3f3a93f13b70959b6ba57b22bf8851b5c88929d4 (patch) | |
| tree | 80e10cc0c85a02d82392b103b51c0e1d94d2adaf /src/core | |
| parent | Merge pull request #2555 from lioncash/tls (diff) | |
| parent | yuzu: Remove CPU Jit setting from the UI (diff) | |
| download | yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar.gz yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar.bz2 yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar.lz yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar.xz yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar.zst yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core_cpu.cpp | 4 | ||||
| -rw-r--r-- | src/core/settings.cpp | 2 | ||||
| -rw-r--r-- | src/core/settings.h | 2 | ||||
| -rw-r--r-- | src/core/telemetry_session.cpp | 2 |
4 files changed, 5 insertions, 5 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() { Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_barrier, std::size_t core_index) : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} { - if (Settings::values.use_cpu_jit) { + if (Settings::values.cpu_jit_enabled) { #ifdef ARCHITECTURE_x86_64 arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index); #else @@ -70,7 +70,7 @@ Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_ba Cpu::~Cpu() = default; std::unique_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) { - if (Settings::values.use_cpu_jit) { + if (Settings::values.cpu_jit_enabled) { #ifdef ARCHITECTURE_x86_64 return std::make_unique<DynarmicExclusiveMonitor>(num_cores); #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() { LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0)); LogSetting("System_CurrentUser", Settings::values.current_user); LogSetting("System_LanguageIndex", Settings::values.language_index); - LogSetting("Core_UseCpuJit", Settings::values.use_cpu_jit); + LogSetting("Core_CpuJitEnabled", Settings::values.cpu_jit_enabled); LogSetting("Core_UseMultiCore", Settings::values.use_multi_core); LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor); LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit); diff --git a/src/core/settings.h b/src/core/settings.h index 0e0b4e15c..acf18d653 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -378,7 +378,7 @@ struct Values { std::atomic_bool is_device_reload_pending{true}; // Core - bool use_cpu_jit; + bool cpu_jit_enabled; bool use_multi_core; // 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) { AddField(Telemetry::FieldType::UserConfig, "Audio_SinkId", Settings::values.sink_id); AddField(Telemetry::FieldType::UserConfig, "Audio_EnableAudioStretching", Settings::values.enable_audio_stretching); - AddField(Telemetry::FieldType::UserConfig, "Core_UseCpuJit", Settings::values.use_cpu_jit); + AddField(Telemetry::FieldType::UserConfig, "Core_UseCpuJit", Settings::values.cpu_jit_enabled); AddField(Telemetry::FieldType::UserConfig, "Core_UseMultiCore", Settings::values.use_multi_core); AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor", |