summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu_cmd/config.cpp')
-rw-r--r--src/yuzu_cmd/config.cpp35
1 files changed, 29 insertions, 6 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 325584a1a..640d7d111 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -242,17 +242,15 @@ static const std::array<int, 8> keyboard_mods{
242}; 242};
243 243
244template <> 244template <>
245void Config::ReadSetting(const std::string& group, Settings::BasicSetting<float>& setting) {
246 setting = sdl2_config->GetReal(group, setting.GetLabel(), setting.GetDefault());
247}
248template <>
249void Config::ReadSetting(const std::string& group, Settings::BasicSetting<std::string>& setting) { 245void Config::ReadSetting(const std::string& group, Settings::BasicSetting<std::string>& setting) {
250 setting = sdl2_config->Get(group, setting.GetLabel(), setting.GetDefault()); 246 setting = sdl2_config->Get(group, setting.GetLabel(), setting.GetDefault());
251} 247}
248
252template <> 249template <>
253void Config::ReadSetting(const std::string& group, Settings::BasicSetting<bool>& setting) { 250void Config::ReadSetting(const std::string& group, Settings::BasicSetting<bool>& setting) {
254 setting = sdl2_config->GetBoolean(group, setting.GetLabel(), setting.GetDefault()); 251 setting = sdl2_config->GetBoolean(group, setting.GetLabel(), setting.GetDefault());
255} 252}
253
256template <typename Type> 254template <typename Type>
257void Config::ReadSetting(const std::string& group, Settings::BasicSetting<Type>& setting) { 255void Config::ReadSetting(const std::string& group, Settings::BasicSetting<Type>& setting) {
258 setting = static_cast<Type>(sdl2_config->GetInteger(group, setting.GetLabel(), 256 setting = static_cast<Type>(sdl2_config->GetInteger(group, setting.GetLabel(),
@@ -294,6 +292,8 @@ void Config::ReadValues() {
294 292
295 ReadSetting("ControlsGeneral", Settings::values.motion_device); 293 ReadSetting("ControlsGeneral", Settings::values.motion_device);
296 294
295 ReadSetting("ControlsGeneral", Settings::values.touch_device);
296
297 ReadSetting("ControlsGeneral", Settings::values.keyboard_enabled); 297 ReadSetting("ControlsGeneral", Settings::values.keyboard_enabled);
298 298
299 ReadSetting("ControlsGeneral", Settings::values.debug_pad_enabled); 299 ReadSetting("ControlsGeneral", Settings::values.debug_pad_enabled);
@@ -416,16 +416,39 @@ void Config::ReadValues() {
416 } 416 }
417 417
418 ReadSetting("System", Settings::values.language_index); 418 ReadSetting("System", Settings::values.language_index);
419 ReadSetting("System", Settings::values.region_index);
419 ReadSetting("System", Settings::values.time_zone_index); 420 ReadSetting("System", Settings::values.time_zone_index);
421 ReadSetting("System", Settings::values.sound_index);
420 422
421 // Core 423 // Core
422 ReadSetting("Core", Settings::values.use_multi_core); 424 ReadSetting("Core", Settings::values.use_multi_core);
423 425
426 // Cpu
427 ReadSetting("Cpu", Settings::values.cpu_accuracy);
428 ReadSetting("Cpu", Settings::values.cpu_debug_mode);
429 ReadSetting("Cpu", Settings::values.cpuopt_page_tables);
430 ReadSetting("Cpu", Settings::values.cpuopt_block_linking);
431 ReadSetting("Cpu", Settings::values.cpuopt_return_stack_buffer);
432 ReadSetting("Cpu", Settings::values.cpuopt_fast_dispatcher);
433 ReadSetting("Cpu", Settings::values.cpuopt_context_elimination);
434 ReadSetting("Cpu", Settings::values.cpuopt_const_prop);
435 ReadSetting("Cpu", Settings::values.cpuopt_misc_ir);
436 ReadSetting("Cpu", Settings::values.cpuopt_reduce_misalign_checks);
437 ReadSetting("Cpu", Settings::values.cpuopt_fastmem);
438 ReadSetting("Cpu", Settings::values.cpuopt_unsafe_unfuse_fma);
439 ReadSetting("Cpu", Settings::values.cpuopt_unsafe_reduce_fp_error);
440 ReadSetting("Cpu", Settings::values.cpuopt_unsafe_ignore_standard_fpcr);
441 ReadSetting("Cpu", Settings::values.cpuopt_unsafe_inaccurate_nan);
442 ReadSetting("Cpu", Settings::values.cpuopt_unsafe_fastmem_check);
443
424 // Renderer 444 // Renderer
425 ReadSetting("Renderer", Settings::values.renderer_backend); 445 ReadSetting("Renderer", Settings::values.renderer_backend);
426 ReadSetting("Renderer", Settings::values.renderer_debug); 446 ReadSetting("Renderer", Settings::values.renderer_debug);
447 ReadSetting("Renderer", Settings::values.enable_nsight_aftermath);
448 ReadSetting("Renderer", Settings::values.disable_shader_loop_safety_checks);
427 ReadSetting("Renderer", Settings::values.vulkan_device); 449 ReadSetting("Renderer", Settings::values.vulkan_device);
428 450
451 ReadSetting("Renderer", Settings::values.fullscreen_mode);
429 ReadSetting("Renderer", Settings::values.aspect_ratio); 452 ReadSetting("Renderer", Settings::values.aspect_ratio);
430 ReadSetting("Renderer", Settings::values.max_anisotropy); 453 ReadSetting("Renderer", Settings::values.max_anisotropy);
431 ReadSetting("Renderer", Settings::values.use_frame_limit); 454 ReadSetting("Renderer", Settings::values.use_frame_limit);
@@ -435,11 +458,12 @@ void Config::ReadValues() {
435 ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation); 458 ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation);
436 ReadSetting("Renderer", Settings::values.use_vsync); 459 ReadSetting("Renderer", Settings::values.use_vsync);
437 ReadSetting("Renderer", Settings::values.disable_fps_limit); 460 ReadSetting("Renderer", Settings::values.disable_fps_limit);
438 ReadSetting("Renderer", Settings::values.use_assembly_shaders); 461 ReadSetting("Renderer", Settings::values.shader_backend);
439 ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); 462 ReadSetting("Renderer", Settings::values.use_asynchronous_shaders);
440 ReadSetting("Renderer", Settings::values.use_nvdec_emulation); 463 ReadSetting("Renderer", Settings::values.use_nvdec_emulation);
441 ReadSetting("Renderer", Settings::values.accelerate_astc); 464 ReadSetting("Renderer", Settings::values.accelerate_astc);
442 ReadSetting("Renderer", Settings::values.use_fast_gpu_time); 465 ReadSetting("Renderer", Settings::values.use_fast_gpu_time);
466 ReadSetting("Renderer", Settings::values.use_caches_gc);
443 467
444 ReadSetting("Renderer", Settings::values.bg_red); 468 ReadSetting("Renderer", Settings::values.bg_red);
445 ReadSetting("Renderer", Settings::values.bg_green); 469 ReadSetting("Renderer", Settings::values.bg_green);
@@ -460,7 +484,6 @@ void Config::ReadValues() {
460 // Debugging 484 // Debugging
461 Settings::values.record_frame_times = 485 Settings::values.record_frame_times =
462 sdl2_config->GetBoolean("Debugging", "record_frame_times", false); 486 sdl2_config->GetBoolean("Debugging", "record_frame_times", false);
463 ReadSetting("Debugging", Settings::values.program_args);
464 ReadSetting("Debugging", Settings::values.dump_exefs); 487 ReadSetting("Debugging", Settings::values.dump_exefs);
465 ReadSetting("Debugging", Settings::values.dump_nso); 488 ReadSetting("Debugging", Settings::values.dump_nso);
466 ReadSetting("Debugging", Settings::values.enable_fs_access_log); 489 ReadSetting("Debugging", Settings::values.enable_fs_access_log);