H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: Reorder

Browse Source 
Groups graphics audio and system settings together in a way that
reflects the frontend. This also just conceptually groups them more
nicely than they were.
This commit is contained in:
lat9nq 2023-06-09 17:24:29 -04:00
parent 681ebcf4a5
commit 163f229d26
1 changed files with 78 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
src/common/settings.h
View File

@ -557,8 +557,11 @@ struct Values {
Setting<AudioEngine> sink_id{linkage, AudioEngine::Auto, "output_engine", Category::Audio}; Setting<AudioEngine> sink_id{linkage, AudioEngine::Auto, "output_engine", Category::Audio};
Setting<std::string> audio_output_device_id{linkage, "auto", "output_device", Category::Audio}; Setting<std::string> audio_output_device_id{linkage, "auto", "output_device", Category::Audio};
Setting<std::string> audio_input_device_id{linkage, "auto", "input_device", Category::Audio}; Setting<std::string> audio_input_device_id{linkage, "auto", "input_device", Category::Audio};
Setting<bool, false> audio_muted{linkage, false, "audio_muted", Category::Audio, false}; SwitchableSetting<AudioMode, true> sound_index{linkage, AudioMode::Stereo,
AudioMode::Mono, AudioMode::Surround,
"sound_index", Category::SystemAudio};
SwitchableSetting<u8, true> volume{linkage, 100, 0, 200, "volume", Category::Audio, true, true}; SwitchableSetting<u8, true> volume{linkage, 100, 0, 200, "volume", Category::Audio, true, true};
Setting<bool, false> audio_muted{linkage, false, "audio_muted", Category::Audio, false};
Setting<bool, false> dump_audio_commands{linkage, false, "dump_audio_commands", Category::Audio, Setting<bool, false> dump_audio_commands{linkage, false, "dump_audio_commands", Category::Audio,
false}; false};
@ -612,28 +615,35 @@ struct Values {
SwitchableSetting<RendererBackend, true> renderer_backend{ SwitchableSetting<RendererBackend, true> renderer_backend{
linkage, RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null, linkage, RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null,
"backend", Category::Renderer}; "backend", Category::Renderer};
SwitchableSetting<bool> async_presentation{linkage, false, "async_presentation", SwitchableSetting<ShaderBackend, true> shader_backend{
Category::RendererAdvanced}; linkage, ShaderBackend::Glsl, ShaderBackend::Glsl, ShaderBackend::SpirV,
SwitchableSetting<bool> renderer_force_max_clock{linkage, false, "force_max_clock", "shader_backend", Category::Renderer};
Category::RendererAdvanced};
Setting<bool> renderer_debug{linkage, false, "debug", Category::RendererDebug};
Setting<bool> renderer_shader_feedback{linkage, false, "shader_feedback",
Category::RendererDebug};
Setting<bool> enable_nsight_aftermath{linkage, false, "nsight_aftermath",
Category::RendererDebug};
Setting<bool> disable_shader_loop_safety_checks{
linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer}; SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer};
ResolutionScalingInfo resolution_info{}; SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X, Category::Renderer};
"resolution_setup", Category::Renderer}; SwitchableSetting<bool> use_asynchronous_gpu_emulation{
SwitchableSetting<ScalingFilter, false> scaling_filter{ linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer, true, true}; SwitchableSetting<bool, false> use_speed_limit{
SwitchableSetting<int, true> fsr_sharpening_slider{ linkage, true, "use_speed_limit", Category::Renderer, false, true};
linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer, true, true}; SwitchableSetting<u16, true> speed_limit{
SwitchableSetting<AntiAliasing, false> anti_aliasing{ linkage, 100, 0, 9999, "speed_limit", Category::Renderer, true, true};
linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer, true, true}; SwitchableSetting<AstcDecodeMode, true> accelerate_astc{linkage,
AstcDecodeMode::Cpu,
AstcDecodeMode::Cpu,
AstcDecodeMode::CpuAsynchronous,
"accelerate_astc",
Category::Renderer};
Setting<VSyncMode, true> vsync_mode{linkage,
VSyncMode::Fifo,
VSyncMode::Immediate,
VSyncMode::FifoRelaxed,
"use_vsync",
Category::Renderer,
true,
true};
SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::Gpu,
"nvdec_emulation", Category::Renderer};
// *nix platforms may have issues with the borderless windowed fullscreen mode. // *nix platforms may have issues with the borderless windowed fullscreen mode.
// Default to exclusive fullscreen on these platforms for now. // Default to exclusive fullscreen on these platforms for now.
SwitchableSetting<FullscreenMode, true> fullscreen_mode{linkage, SwitchableSetting<FullscreenMode, true> fullscreen_mode{linkage,
@ -656,15 +666,21 @@ struct Values {
Category::Renderer, Category::Renderer,
true, true,
true}; true};
SwitchableSetting<AnisotropyMode, true> max_anisotropy{
linkage, AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16, ResolutionScalingInfo resolution_info{};
"max_anisotropy", Category::RendererAdvanced}; SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
SwitchableSetting<bool, false> use_speed_limit{ "resolution_setup", Category::Renderer};
linkage, true, "use_speed_limit", Category::Renderer, false, true}; SwitchableSetting<ScalingFilter, false> scaling_filter{
SwitchableSetting<u16, true> speed_limit{ linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer, true, true};
linkage, 100, 0, 9999, "speed_limit", Category::Renderer, true, true}; SwitchableSetting<AntiAliasing, false> anti_aliasing{
SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache", linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer, true, true};
Category::Renderer}; SwitchableSetting<int, true> fsr_sharpening_slider{
linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer, true, true};
SwitchableSetting<u8, false> bg_red{linkage, 0, "bg_red", Category::Renderer, true, true};
SwitchableSetting<u8, false> bg_green{linkage, 0, "bg_green", Category::Renderer, true, true};
SwitchableSetting<u8, false> bg_blue{linkage, 0, "bg_blue", Category::Renderer, true, true};
SwitchableSetting<GpuAccuracy, true> gpu_accuracy{linkage, SwitchableSetting<GpuAccuracy, true> gpu_accuracy{linkage,
GpuAccuracy::High, GpuAccuracy::High,
GpuAccuracy::Normal, GpuAccuracy::Normal,
@ -673,29 +689,21 @@ struct Values {
Category::RendererAdvanced, Category::RendererAdvanced,
true, true,
true}; true};
SwitchableSetting<bool> use_asynchronous_gpu_emulation{ SwitchableSetting<AnisotropyMode, true> max_anisotropy{
linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer}; linkage, AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::Gpu, "max_anisotropy", Category::RendererAdvanced};
"nvdec_emulation", Category::Renderer}; SwitchableSetting<AstcRecompression, true> astc_recompression{linkage,
SwitchableSetting<AstcDecodeMode, true> accelerate_astc{linkage, AstcRecompression::Uncompressed,
AstcDecodeMode::Cpu, AstcRecompression::Uncompressed,
AstcDecodeMode::Cpu, AstcRecompression::Bc3,
AstcDecodeMode::CpuAsynchronous, "astc_recompression",
"accelerate_astc", Category::RendererAdvanced};
Category::Renderer}; SwitchableSetting<bool> async_presentation{linkage, false, "async_presentation",
Setting<VSyncMode, true> vsync_mode{linkage, Category::RendererAdvanced};
VSyncMode::Fifo, SwitchableSetting<bool> renderer_force_max_clock{linkage, false, "force_max_clock",
VSyncMode::Immediate, Category::RendererAdvanced};
VSyncMode::FifoRelaxed,
"use_vsync",
Category::Renderer,
true,
true};
SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing", SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
Category::RendererAdvanced}; Category::RendererAdvanced};
SwitchableSetting<ShaderBackend, true> shader_backend{
linkage, ShaderBackend::Glsl, ShaderBackend::Glsl, ShaderBackend::SpirV,
"shader_backend", Category::Renderer};
SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders", SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
Category::RendererAdvanced}; Category::RendererAdvanced};
SwitchableSetting<bool, false> use_fast_gpu_time{ SwitchableSetting<bool, false> use_fast_gpu_time{
@ -704,34 +712,20 @@ struct Values {
linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced, true, true}; linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced, true, true};
SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines", SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
Category::RendererAdvanced}; Category::RendererAdvanced};
SwitchableSetting<AstcRecompression, true> astc_recompression{linkage,
AstcRecompression::Uncompressed,
AstcRecompression::Uncompressed,
AstcRecompression::Bc3,
"astc_recompression",
Category::RendererAdvanced};
SwitchableSetting<bool> use_video_framerate{linkage, false, "use_video_framerate", SwitchableSetting<bool> use_video_framerate{linkage, false, "use_video_framerate",
Category::RendererAdvanced}; Category::RendererAdvanced};
SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops", SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops",
Category::RendererAdvanced}; Category::RendererAdvanced};
SwitchableSetting<u8, false> bg_red{linkage, 0, "bg_red", Category::Renderer, true, true}; Setting<bool> renderer_debug{linkage, false, "debug", Category::RendererDebug};
SwitchableSetting<u8, false> bg_green{linkage, 0, "bg_green", Category::Renderer, true, true}; Setting<bool> renderer_shader_feedback{linkage, false, "shader_feedback",
SwitchableSetting<u8, false> bg_blue{linkage, 0, "bg_blue", Category::Renderer, true, true}; Category::RendererDebug};
Setting<bool> enable_nsight_aftermath{linkage, false, "nsight_aftermath",
Category::RendererDebug};
Setting<bool> disable_shader_loop_safety_checks{
linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
// System // System
SwitchableSetting<bool> rng_seed_enabled{linkage, false, "rng_seed_enabled",
Category::System, true, true};
SwitchableSetting<u32> rng_seed{linkage, 0, "rng_seed", Category::System, true, true};
Setting<std::string> device_name{linkage, "Yuzu", "device_name", Category::System, true, true};
// Measured in seconds since epoch
SwitchableSetting<bool> custom_rtc_enabled{linkage, false, "custom_rtc_enabled",
Category::System, true, true};
SwitchableSetting<s64> custom_rtc{linkage, 0, "custom_rtc", Category::System, true, true};
// Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`
s64 custom_rtc_differential;
Setting<s32> current_user{linkage, 0, "current_user", Category::System};
SwitchableSetting<Language, true> language_index{linkage, SwitchableSetting<Language, true> language_index{linkage,
Language::EnglishAmerican, Language::EnglishAmerican,
Language::Japanese, Language::Japanese,
@ -743,9 +737,18 @@ struct Values {
SwitchableSetting<TimeZone, true> time_zone_index{linkage, TimeZone::Auto, SwitchableSetting<TimeZone, true> time_zone_index{linkage, TimeZone::Auto,
TimeZone::Auto, TimeZone::Zulu, TimeZone::Auto, TimeZone::Zulu,
"time_zone_index", Category::System}; "time_zone_index", Category::System};
SwitchableSetting<AudioMode, true> sound_index{linkage, AudioMode::Stereo, // Measured in seconds since epoch
AudioMode::Mono, AudioMode::Surround, SwitchableSetting<bool> custom_rtc_enabled{linkage, false, "custom_rtc_enabled",
"sound_index", Category::SystemAudio}; Category::System, true, true};
SwitchableSetting<s64> custom_rtc{linkage, 0, "custom_rtc", Category::System, true, true};
// Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`
s64 custom_rtc_differential;
SwitchableSetting<bool> rng_seed_enabled{linkage, false, "rng_seed_enabled",
Category::System, true, true};
SwitchableSetting<u32> rng_seed{linkage, 0, "rng_seed", Category::System, true, true};
Setting<std::string> device_name{linkage, "Yuzu", "device_name", Category::System, true, true};
Setting<s32> current_user{linkage, 0, "current_user", Category::System};
SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System}; SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System};