VERY experimental Nintendo Switch 2 emulator
C++
settings: Consolidate RangedSetting's with regular ones
lat9nq6e65bb6f83db
diff --git a/src/common/settings.h b/src/common/settings.hindex a507744a22..3583a2e709 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -101,15 +101,15 @@ struct ResolutionScalingInfo {}};-/** The BasicSetting class is a simple resource manager. It defines a label and default value- * alongside the actual value of the setting for simpler and less-error prone use with frontend- * configurations. Setting a default value and label is required, though subclasses may deviate from- * this requirement.+/** The Setting class is a simple resource manager. It defines a label and default value alongside+ * the actual value of the setting for simpler and less-error prone use with frontend+ * configurations. Specifying a default value and label is required. A minimum and maximum range can+ * be specified for sanitization.*/template <typename Type>-class BasicSetting {+class Setting {protected:- BasicSetting() = default;+ Setting() = default;/*** Only sets the setting to the given initializer, leaving the other members to their default@@ -117,7 +117,7 @@ protected:** @param global_val Initial value of the setting*/- explicit BasicSetting(const Type& global_val) : global{global_val} {}+ explicit Setting(const Type& val) : value{val} {}public:/**@@ -126,9 +126,22 @@ public:* @param default_val Intial value of the setting, and default value of the setting* @param name Label for the setting*/- explicit BasicSetting(const Type& default_val, const std::string& name)- : default_value{default_val}, global{default_val}, label{name} {}- virtual ~BasicSetting() = default;+ explicit Setting(const Type& default_val, const std::string& name)+ : value{default_val}, default_value{default_val}, ranged{false}, label{name} {}+ virtual ~Setting() = default;++ /**+ * Sets a default value, minimum value, maximum value, and label.+ *+ * @param default_val Intial value of the setting, and default value of the setting+ * @param min_val Sets the minimum allowed value of the setting+ * @param max_val Sets the maximum allowed value of the setting+ * @param name Label for the setting+ */+ explicit Setting(const Type& default_val, const Type& min_val, const Type& max_val,+ const std::string& name)+ : value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val},+ ranged{true}, label{name} {}/*** Returns a reference to the setting's value.@@ -136,17 +149,17 @@ public:* @returns A reference to the setting*/[[nodiscard]] virtual const Type& GetValue() const {- return global;+ return value;}/*** Sets the setting to the given value.*- * @param value The desired value+ * @param val The desired value*/- virtual void SetValue(const Type& value) {- Type temp{value};- std::swap(global, temp);+ virtual void SetValue(const Type& val) {+ Type temp{(ranged) ? std::clamp(val, minimum, maximum) : val};+ std::swap(value, temp);}/**@@ -170,14 +183,14 @@ public:/*** Assigns a value to the setting.*- * @param value The desired setting value+ * @param val The desired setting value** @returns A reference to the setting*/- virtual const Type& operator=(const Type& value) {- Type temp{value};- std::swap(global, temp);- return global;+ virtual const Type& operator=(const Type& val) {+ Type temp{(ranged) ? std::clamp(val, minimum, maximum) : val};+ std::swap(value, temp);+ return value;}/**@@ -186,72 +199,28 @@ public:* @returns A reference to the setting*/explicit virtual operator const Type&() const {- return global;+ return value;}protected:+ Type value{}; ///< The settingconst Type default_value{}; ///< The default value- Type global{}; ///< The setting+ const Type maximum{}; ///< Maximum allowed value of the setting+ const Type minimum{}; ///< Minimum allowed value of the setting+ const bool ranged; ///< The setting has sanitization rangesconst std::string label{}; ///< The setting's label};/**- * BasicRangedSetting class is intended for use with quantifiable settings that need a more- * restrictive range than implicitly defined by its type. Implements a minimum and maximum that is- * simply used to sanitize SetValue and the assignment overload.- */-template <typename Type>-class BasicRangedSetting : virtual public BasicSetting<Type> {-public:- /**- * Sets a default value, minimum value, maximum value, and label.- *- * @param default_val Intial value of the setting, and default value of the setting- * @param min_val Sets the minimum allowed value of the setting- * @param max_val Sets the maximum allowed value of the setting- * @param name Label for the setting- */- explicit BasicRangedSetting(const Type& default_val, const Type& min_val, const Type& max_val,- const std::string& name)- : BasicSetting<Type>{default_val, name}, minimum{min_val}, maximum{max_val} {}- virtual ~BasicRangedSetting() = default;-- /**- * Like BasicSetting's SetValue, except value is clamped to the range of the setting.- *- * @param value The desired value- */- void SetValue(const Type& value) override {- this->global = std::clamp(value, minimum, maximum);- }-- /**- * Like BasicSetting's assignment overload, except value is clamped to the range of the setting.- *- * @param value The desired value- * @returns A reference to the setting's value- */- const Type& operator=(const Type& value) override {- this->global = std::clamp(value, minimum, maximum);- return this->global;- }-- const Type minimum; ///< Minimum allowed value of the setting- const Type maximum; ///< Maximum allowed value of the setting-};--/**- * The Setting class is a slightly more complex version of the BasicSetting class. This adds a+ * The SwitchableSetting class is a slightly more complex version of the Setting class. This adds a* custom setting to switch to when a guest application specifically requires it. The effect is that* other components of the emulator can access the setting's intended value without any need for the* component to ask whether the custom or global setting is needed at the moment.** By default, the global setting is used.- *- * Like the BasicSetting, this requires setting a default value and label to use.*/template <typename Type>-class Setting : virtual public BasicSetting<Type> {+class SwitchableSetting : virtual public Setting<Type> {public:/*** Sets a default value, label, and setting value.@@ -259,9 +228,21 @@ public:* @param default_val Intial value of the setting, and default value of the setting* @param name Label for the setting*/- explicit Setting(const Type& default_val, const std::string& name)- : BasicSetting<Type>(default_val, name) {}- virtual ~Setting() = default;+ explicit SwitchableSetting(const Type& default_val, const std::string& name)+ : Setting<Type>{default_val, name} {}+ virtual ~SwitchableSetting() = default;++ /**+ * Sets a default value, minimum value, maximum value, and label.+ *+ * @param default_val Intial value of the setting, and default value of the setting+ * @param min_val Sets the minimum allowed value of the setting+ * @param max_val Sets the maximum allowed value of the setting+ * @param name Label for the setting+ */+ explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val,+ const std::string& name)+ : Setting<Type>{default_val, min_val, max_val, name} {}/*** Tells this setting to represent either the global or custom setting when other member@@ -292,13 +273,13 @@ public:*/[[nodiscard]] virtual const Type& GetValue() const override {if (use_global) {- return this->global;+ return this->value;}return custom;}[[nodiscard]] virtual const Type& GetValue(bool need_global) const {if (use_global || need_global) {- return this->global;+ return this->value;}return custom;}@@ -306,12 +287,12 @@ public:/*** Sets the current setting value depending on the global state.*- * @param value The new value+ * @param val The new value*/- void SetValue(const Type& value) override {- Type temp{value};+ void SetValue(const Type& val) override {+ Type temp{(this->ranged) ? std::clamp(val, this->minimum, this->maximum) : val};if (use_global) {- std::swap(this->global, temp);+ std::swap(this->value, temp);} else {std::swap(custom, temp);}@@ -320,15 +301,15 @@ public:/*** Assigns the current setting value depending on the global state.*- * @param value The new value+ * @param val The new value** @returns A reference to the current setting value*/- const Type& operator=(const Type& value) override {- Type temp{value};+ const Type& operator=(const Type& val) override {+ Type temp{(this->ranged) ? std::clamp(val, this->minimum, this->maximum) : val};if (use_global) {- std::swap(this->global, temp);- return this->global;+ std::swap(this->value, temp);+ return this->value;}std::swap(custom, temp);return custom;@@ -341,7 +322,7 @@ public:*/virtual explicit operator const Type&() const override {if (use_global) {- return this->global;+ return this->value;}return custom;}@@ -351,75 +332,6 @@ protected:Type custom{}; ///< The custom value of the setting};-/**- * RangedSetting is a Setting that implements a maximum and minimum value for its setting. Intended- * for use with quantifiable settings.- */-template <typename Type>-class RangedSetting final : public BasicRangedSetting<Type>, public Setting<Type> {-public:- /**- * Sets a default value, minimum value, maximum value, and label.- *- * @param default_val Intial value of the setting, and default value of the setting- * @param min_val Sets the minimum allowed value of the setting- * @param max_val Sets the maximum allowed value of the setting- * @param name Label for the setting- */- explicit RangedSetting(const Type& default_val, const Type& min_val, const Type& max_val,- const std::string& name)- : BasicSetting<Type>{default_val, name},- BasicRangedSetting<Type>{default_val, min_val, max_val, name}, Setting<Type>{default_val,- name} {}- virtual ~RangedSetting() = default;-- // The following are needed to avoid a MSVC bug- // (source: https://stackoverflow.com/questions/469508)- [[nodiscard]] const Type& GetValue() const override {- return Setting<Type>::GetValue();- }- [[nodiscard]] const Type& GetValue(bool need_global) const override {- return Setting<Type>::GetValue(need_global);- }- explicit operator const Type&() const override {- if (this->use_global) {- return this->global;- }- return this->custom;- }-- /**- * Like BasicSetting's SetValue, except value is clamped to the range of the setting. Sets the- * appropriate value depending on the global state.- *- * @param value The desired value- */- void SetValue(const Type& value) override {- const Type temp = std::clamp(value, this->minimum, this->maximum);- if (this->use_global) {- this->global = temp;- }- this->custom = temp;- }-- /**- * Like BasicSetting's assignment overload, except value is clamped to the range of the setting.- * Uses the appropriate value depending on the global state.- *- * @param value The desired value- * @returns A reference to the setting's value- */- const Type& operator=(const Type& value) override {- const Type temp = std::clamp(value, this->minimum, this->maximum);- if (this->use_global) {- this->global = temp;- return this->global;- }- this->custom = temp;- return this->custom;- }-};-/*** The InputSetting class allows for getting a reference to either the global or custom members.* This is required as we cannot easily modify the values of user-defined types within containers@@ -431,7 +343,7 @@ template <typename Type>class InputSetting final {public:InputSetting() = default;- explicit InputSetting(Type val) : BasicSetting<Type>(val) {}+ explicit InputSetting(Type val) : Setting<Type>(val) {}~InputSetting() = default;void SetGlobal(bool to_global) {use_global = to_global;@@ -459,175 +371,175 @@ struct TouchFromButtonMap {struct Values {// Audio- BasicSetting<std::string> audio_device_id{"auto", "output_device"};- BasicSetting<std::string> sink_id{"auto", "output_engine"};- BasicSetting<bool> audio_muted{false, "audio_muted"};- RangedSetting<u8> volume{100, 0, 100, "volume"};+ Setting<std::string> audio_device_id{"auto", "output_device"};+ Setting<std::string> sink_id{"auto", "output_engine"};+ Setting<bool> audio_muted{false, "audio_muted"};+ SwitchableSetting<u8> volume{100, 0, 100, "volume"};// Core- Setting<bool> use_multi_core{true, "use_multi_core"};- Setting<bool> use_extended_memory_layout{false, "use_extended_memory_layout"};+ SwitchableSetting<bool> use_multi_core{true, "use_multi_core"};+ SwitchableSetting<bool> use_extended_memory_layout{false, "use_extended_memory_layout"};// Cpu- RangedSetting<CPUAccuracy> cpu_accuracy{CPUAccuracy::Auto, CPUAccuracy::Auto,- CPUAccuracy::Paranoid, "cpu_accuracy"};+ SwitchableSetting<CPUAccuracy> cpu_accuracy{CPUAccuracy::Auto, CPUAccuracy::Auto,+ CPUAccuracy::Paranoid, "cpu_accuracy"};// TODO: remove cpu_accuracy_first_time, migration setting added 8 July 2021- BasicSetting<bool> cpu_accuracy_first_time{true, "cpu_accuracy_first_time"};- BasicSetting<bool> cpu_debug_mode{false, "cpu_debug_mode"};-- BasicSetting<bool> cpuopt_page_tables{true, "cpuopt_page_tables"};- BasicSetting<bool> cpuopt_block_linking{true, "cpuopt_block_linking"};- BasicSetting<bool> cpuopt_return_stack_buffer{true, "cpuopt_return_stack_buffer"};- BasicSetting<bool> cpuopt_fast_dispatcher{true, "cpuopt_fast_dispatcher"};- BasicSetting<bool> cpuopt_context_elimination{true, "cpuopt_context_elimination"};- BasicSetting<bool> cpuopt_const_prop{true, "cpuopt_const_prop"};- BasicSetting<bool> cpuopt_misc_ir{true, "cpuopt_misc_ir"};- BasicSetting<bool> cpuopt_reduce_misalign_checks{true, "cpuopt_reduce_misalign_checks"};- BasicSetting<bool> cpuopt_fastmem{true, "cpuopt_fastmem"};- BasicSetting<bool> cpuopt_fastmem_exclusives{true, "cpuopt_fastmem_exclusives"};- BasicSetting<bool> cpuopt_recompile_exclusives{true, "cpuopt_recompile_exclusives"};-- Setting<bool> cpuopt_unsafe_unfuse_fma{true, "cpuopt_unsafe_unfuse_fma"};- Setting<bool> cpuopt_unsafe_reduce_fp_error{true, "cpuopt_unsafe_reduce_fp_error"};- Setting<bool> cpuopt_unsafe_ignore_standard_fpcr{true, "cpuopt_unsafe_ignore_standard_fpcr"};- Setting<bool> cpuopt_unsafe_inaccurate_nan{true, "cpuopt_unsafe_inaccurate_nan"};- Setting<bool> cpuopt_unsafe_fastmem_check{true, "cpuopt_unsafe_fastmem_check"};- Setting<bool> cpuopt_unsafe_ignore_global_monitor{true, "cpuopt_unsafe_ignore_global_monitor"};+ Setting<bool> cpu_accuracy_first_time{true, "cpu_accuracy_first_time"};+ Setting<bool> cpu_debug_mode{false, "cpu_debug_mode"};++ Setting<bool> cpuopt_page_tables{true, "cpuopt_page_tables"};+ Setting<bool> cpuopt_block_linking{true, "cpuopt_block_linking"};+ Setting<bool> cpuopt_return_stack_buffer{true, "cpuopt_return_stack_buffer"};+ Setting<bool> cpuopt_fast_dispatcher{true, "cpuopt_fast_dispatcher"};+ Setting<bool> cpuopt_context_elimination{true, "cpuopt_context_elimination"};+ Setting<bool> cpuopt_const_prop{true, "cpuopt_const_prop"};+ Setting<bool> cpuopt_misc_ir{true, "cpuopt_misc_ir"};+ Setting<bool> cpuopt_reduce_misalign_checks{true, "cpuopt_reduce_misalign_checks"};+ Setting<bool> cpuopt_fastmem{true, "cpuopt_fastmem"};+ Setting<bool> cpuopt_fastmem_exclusives{true, "cpuopt_fastmem_exclusives"};+ Setting<bool> cpuopt_recompile_exclusives{true, "cpuopt_recompile_exclusives"};++ SwitchableSetting<bool> cpuopt_unsafe_unfuse_fma{true, "cpuopt_unsafe_unfuse_fma"};+ SwitchableSetting<bool> cpuopt_unsafe_reduce_fp_error{true, "cpuopt_unsafe_reduce_fp_error"};+ SwitchableSetting<bool> cpuopt_unsafe_ignore_standard_fpcr{+ true, "cpuopt_unsafe_ignore_standard_fpcr"};+ SwitchableSetting<bool> cpuopt_unsafe_inaccurate_nan{true, "cpuopt_unsafe_inaccurate_nan"};+ SwitchableSetting<bool> cpuopt_unsafe_fastmem_check{true, "cpuopt_unsafe_fastmem_check"};+ SwitchableSetting<bool> cpuopt_unsafe_ignore_global_monitor{+ true, "cpuopt_unsafe_ignore_global_monitor"};// Renderer- RangedSetting<RendererBackend> renderer_backend{+ SwitchableSetting<RendererBackend> renderer_backend{RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Vulkan, "backend"};- BasicSetting<bool> renderer_debug{false, "debug"};- BasicSetting<bool> renderer_shader_feedback{false, "shader_feedback"};- BasicSetting<bool> enable_nsight_aftermath{false, "nsight_aftermath"};- BasicSetting<bool> disable_shader_loop_safety_checks{false,- "disable_shader_loop_safety_checks"};- Setting<int> vulkan_device{0, "vulkan_device"};+ Setting<bool> renderer_debug{false, "debug"};+ Setting<bool> renderer_shader_feedback{false, "shader_feedback"};+ Setting<bool> enable_nsight_aftermath{false, "nsight_aftermath"};+ Setting<bool> disable_shader_loop_safety_checks{false, "disable_shader_loop_safety_checks"};+ SwitchableSetting<int> vulkan_device{0, "vulkan_device"};ResolutionScalingInfo resolution_info{};- Setting<ResolutionSetup> resolution_setup{ResolutionSetup::Res1X, "resolution_setup"};- Setting<ScalingFilter> scaling_filter{ScalingFilter::Bilinear, "scaling_filter"};- Setting<AntiAliasing> anti_aliasing{AntiAliasing::None, "anti_aliasing"};+ SwitchableSetting<ResolutionSetup> resolution_setup{ResolutionSetup::Res1X, "resolution_setup"};+ SwitchableSetting<ScalingFilter> scaling_filter{ScalingFilter::Bilinear, "scaling_filter"};+ SwitchableSetting<AntiAliasing> anti_aliasing{AntiAliasing::None, "anti_aliasing"};// *nix platforms may have issues with the borderless windowed fullscreen mode.// Default to exclusive fullscreen on these platforms for now.- RangedSetting<FullscreenMode> fullscreen_mode{+ SwitchableSetting<FullscreenMode> fullscreen_mode{#ifdef _WIN32FullscreenMode::Borderless,#elseFullscreenMode::Exclusive,#endifFullscreenMode::Borderless, FullscreenMode::Exclusive, "fullscreen_mode"};- RangedSetting<int> aspect_ratio{0, 0, 3, "aspect_ratio"};- RangedSetting<int> max_anisotropy{0, 0, 5, "max_anisotropy"};- Setting<bool> use_speed_limit{true, "use_speed_limit"};- RangedSetting<u16> speed_limit{100, 0, 9999, "speed_limit"};- Setting<bool> use_disk_shader_cache{true, "use_disk_shader_cache"};- RangedSetting<GPUAccuracy> gpu_accuracy{GPUAccuracy::High, GPUAccuracy::Normal,- GPUAccuracy::Extreme, "gpu_accuracy"};- Setting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"};- Setting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"};- Setting<bool> accelerate_astc{true, "accelerate_astc"};- Setting<bool> use_vsync{true, "use_vsync"};- RangedSetting<u16> fps_cap{1000, 1, 1000, "fps_cap"};- BasicSetting<bool> disable_fps_limit{false, "disable_fps_limit"};- RangedSetting<ShaderBackend> shader_backend{ShaderBackend::GLASM, ShaderBackend::GLSL,- ShaderBackend::SPIRV, "shader_backend"};- Setting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"};- Setting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"};-- Setting<u8> bg_red{0, "bg_red"};- Setting<u8> bg_green{0, "bg_green"};- Setting<u8> bg_blue{0, "bg_blue"};+ SwitchableSetting<int> aspect_ratio{0, 0, 3, "aspect_ratio"};+ SwitchableSetting<int> max_anisotropy{0, 0, 5, "max_anisotropy"};+ SwitchableSetting<bool> use_speed_limit{true, "use_speed_limit"};+ SwitchableSetting<u16> speed_limit{100, 0, 9999, "speed_limit"};+ SwitchableSetting<bool> use_disk_shader_cache{true, "use_disk_shader_cache"};+ SwitchableSetting<GPUAccuracy> gpu_accuracy{GPUAccuracy::High, GPUAccuracy::Normal,+ GPUAccuracy::Extreme, "gpu_accuracy"};+ SwitchableSetting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"};+ SwitchableSetting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"};+ SwitchableSetting<bool> accelerate_astc{true, "accelerate_astc"};+ SwitchableSetting<bool> use_vsync{true, "use_vsync"};+ SwitchableSetting<u16> fps_cap{1000, 1, 1000, "fps_cap"};+ Setting<bool> disable_fps_limit{false, "disable_fps_limit"};+ SwitchableSetting<ShaderBackend> shader_backend{ShaderBackend::GLASM, ShaderBackend::GLSL,+ ShaderBackend::SPIRV, "shader_backend"};+ SwitchableSetting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"};+ SwitchableSetting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"};++ SwitchableSetting<u8> bg_red{0, "bg_red"};+ SwitchableSetting<u8> bg_green{0, "bg_green"};+ SwitchableSetting<u8> bg_blue{0, "bg_blue"};// System- Setting<std::optional<u32>> rng_seed{std::optional<u32>(), "rng_seed"};+ SwitchableSetting<std::optional<u32>> rng_seed{std::optional<u32>(), "rng_seed"};// Measured in seconds since epochstd::optional<s64> custom_rtc;// Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`s64 custom_rtc_differential;- BasicSetting<s32> current_user{0, "current_user"};- RangedSetting<s32> language_index{1, 0, 17, "language_index"};- RangedSetting<s32> region_index{1, 0, 6, "region_index"};- RangedSetting<s32> time_zone_index{0, 0, 45, "time_zone_index"};- RangedSetting<s32> sound_index{1, 0, 2, "sound_index"};+ Setting<s32> current_user{0, "current_user"};+ SwitchableSetting<s32> language_index{1, 0, 17, "language_index"};+ SwitchableSetting<s32> region_index{1, 0, 6, "region_index"};+ SwitchableSetting<s32> time_zone_index{0, 0, 45, "time_zone_index"};+ SwitchableSetting<s32> sound_index{1, 0, 2, "sound_index"};// ControlsInputSetting<std::array<PlayerInput, 10>> players;- Setting<bool> use_docked_mode{true, "use_docked_mode"};+ SwitchableSetting<bool> use_docked_mode{true, "use_docked_mode"};- BasicSetting<bool> enable_raw_input{false, "enable_raw_input"};- BasicSetting<bool> controller_navigation{true, "controller_navigation"};+ Setting<bool> enable_raw_input{false, "enable_raw_input"};+ Setting<bool> controller_navigation{true, "controller_navigation"};- Setting<bool> vibration_enabled{true, "vibration_enabled"};- Setting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"};+ SwitchableSetting<bool> vibration_enabled{true, "vibration_enabled"};+ SwitchableSetting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"};- Setting<bool> motion_enabled{true, "motion_enabled"};- BasicSetting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"};- BasicSetting<bool> enable_udp_controller{false, "enable_udp_controller"};+ SwitchableSetting<bool> motion_enabled{true, "motion_enabled"};+ Setting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"};+ Setting<bool> enable_udp_controller{false, "enable_udp_controller"};- BasicSetting<bool> pause_tas_on_load{true, "pause_tas_on_load"};- BasicSetting<bool> tas_enable{false, "tas_enable"};- BasicSetting<bool> tas_loop{false, "tas_loop"};+ Setting<bool> pause_tas_on_load{true, "pause_tas_on_load"};+ Setting<bool> tas_enable{false, "tas_enable"};+ Setting<bool> tas_loop{false, "tas_loop"};- BasicSetting<bool> mouse_panning{false, "mouse_panning"};- BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"};- BasicSetting<bool> mouse_enabled{false, "mouse_enabled"};+ Setting<bool> mouse_panning{false, "mouse_panning"};+ Setting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"};+ Setting<bool> mouse_enabled{false, "mouse_enabled"};- BasicSetting<bool> emulate_analog_keyboard{false, "emulate_analog_keyboard"};- BasicSetting<bool> keyboard_enabled{false, "keyboard_enabled"};+ Setting<bool> emulate_analog_keyboard{false, "emulate_analog_keyboard"};+ Setting<bool> keyboard_enabled{false, "keyboard_enabled"};- BasicSetting<bool> debug_pad_enabled{false, "debug_pad_enabled"};+ Setting<bool> debug_pad_enabled{false, "debug_pad_enabled"};ButtonsRaw debug_pad_buttons;AnalogsRaw debug_pad_analogs;TouchscreenInput touchscreen;- BasicSetting<std::string> touch_device{"min_x:100,min_y:50,max_x:1800,max_y:850",- "touch_device"};- BasicSetting<int> touch_from_button_map_index{0, "touch_from_button_map"};+ Setting<std::string> touch_device{"min_x:100,min_y:50,max_x:1800,max_y:850", "touch_device"};+ Setting<int> touch_from_button_map_index{0, "touch_from_button_map"};std::vector<TouchFromButtonMap> touch_from_button_maps;- BasicSetting<bool> enable_ring_controller{true, "enable_ring_controller"};+ Setting<bool> enable_ring_controller{true, "enable_ring_controller"};RingconRaw ringcon_analogs;// Data Storage- BasicSetting<bool> use_virtual_sd{true, "use_virtual_sd"};- BasicSetting<bool> gamecard_inserted{false, "gamecard_inserted"};- BasicSetting<bool> gamecard_current_game{false, "gamecard_current_game"};- BasicSetting<std::string> gamecard_path{std::string(), "gamecard_path"};+ Setting<bool> use_virtual_sd{true, "use_virtual_sd"};+ Setting<bool> gamecard_inserted{false, "gamecard_inserted"};+ Setting<bool> gamecard_current_game{false, "gamecard_current_game"};+ Setting<std::string> gamecard_path{std::string(), "gamecard_path"};// Debuggingbool record_frame_times;- BasicSetting<bool> use_gdbstub{false, "use_gdbstub"};- BasicSetting<u16> gdbstub_port{6543, "gdbstub_port"};- BasicSetting<std::string> program_args{std::string(), "program_args"};- BasicSetting<bool> dump_exefs{false, "dump_exefs"};- BasicSetting<bool> dump_nso{false, "dump_nso"};- BasicSetting<bool> dump_shaders{false, "dump_shaders"};- BasicSetting<bool> dump_macros{false, "dump_macros"};- BasicSetting<bool> enable_fs_access_log{false, "enable_fs_access_log"};- BasicSetting<bool> reporting_services{false, "reporting_services"};- BasicSetting<bool> quest_flag{false, "quest_flag"};- BasicSetting<bool> disable_macro_jit{false, "disable_macro_jit"};- BasicSetting<bool> extended_logging{false, "extended_logging"};- BasicSetting<bool> use_debug_asserts{false, "use_debug_asserts"};- BasicSetting<bool> use_auto_stub{false, "use_auto_stub"};- BasicSetting<bool> enable_all_controllers{false, "enable_all_controllers"};+ Setting<bool> use_gdbstub{false, "use_gdbstub"};+ Setting<u16> gdbstub_port{6543, "gdbstub_port"};+ Setting<std::string> program_args{std::string(), "program_args"};+ Setting<bool> dump_exefs{false, "dump_exefs"};+ Setting<bool> dump_nso{false, "dump_nso"};+ Setting<bool> dump_shaders{false, "dump_shaders"};+ Setting<bool> dump_macros{false, "dump_macros"};+ Setting<bool> enable_fs_access_log{false, "enable_fs_access_log"};+ Setting<bool> reporting_services{false, "reporting_services"};+ Setting<bool> quest_flag{false, "quest_flag"};+ Setting<bool> disable_macro_jit{false, "disable_macro_jit"};+ Setting<bool> extended_logging{false, "extended_logging"};+ Setting<bool> use_debug_asserts{false, "use_debug_asserts"};+ Setting<bool> use_auto_stub{false, "use_auto_stub"};+ Setting<bool> enable_all_controllers{false, "enable_all_controllers"};// Miscellaneous- BasicSetting<std::string> log_filter{"*:Info", "log_filter"};- BasicSetting<bool> use_dev_keys{false, "use_dev_keys"};+ Setting<std::string> log_filter{"*:Info", "log_filter"};+ Setting<bool> use_dev_keys{false, "use_dev_keys"};// Network- BasicSetting<std::string> network_interface{std::string(), "network_interface"};+ Setting<std::string> network_interface{std::string(), "network_interface"};// WebService- BasicSetting<bool> enable_telemetry{true, "enable_telemetry"};- BasicSetting<std::string> web_api_url{"https://api.yuzu-emu.org", "web_api_url"};- BasicSetting<std::string> yuzu_username{std::string(), "yuzu_username"};- BasicSetting<std::string> yuzu_token{std::string(), "yuzu_token"};+ Setting<bool> enable_telemetry{true, "enable_telemetry"};+ Setting<std::string> web_api_url{"https://api.yuzu-emu.org", "web_api_url"};+ Setting<std::string> yuzu_username{std::string(), "yuzu_username"};+ Setting<std::string> yuzu_token{std::string(), "yuzu_token"};// Add-Onsstd::map<u64, std::vector<std::string>> disabled_addons;diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cppindex 9df4752be6..9686412d07 100644--- a/src/yuzu/configuration/config.cpp+++ b/src/yuzu/configuration/config.cpp@@ -133,7 +133,7 @@ void Config::Initialize(const std::string& config_name) {// Explicit std::string definition: Qt can't implicitly convert a std::string to a QVariant, nor// can it implicitly convert a QVariant back to a {std::,Q}stringtemplate <>-void Config::ReadBasicSetting(Settings::BasicSetting<std::string>& setting) {+void Config::ReadBasicSetting(Settings::Setting<std::string>& setting) {const QString name = QString::fromStdString(setting.GetLabel());const auto default_value = QString::fromStdString(setting.GetDefault());if (qt_config->value(name + QStringLiteral("/default"), false).toBool()) {@@ -144,7 +144,7 @@ void Config::ReadBasicSetting(Settings::BasicSetting<std::string>& setting) {}template <typename Type>-void Config::ReadBasicSetting(Settings::BasicSetting<Type>& setting) {+void Config::ReadBasicSetting(Settings::Setting<Type>& setting) {const QString name = QString::fromStdString(setting.GetLabel());const Type default_value = setting.GetDefault();if (qt_config->value(name + QStringLiteral("/default"), false).toBool()) {@@ -157,7 +157,7 @@ void Config::ReadBasicSetting(Settings::BasicSetting<Type>& setting) {// Explicit std::string definition: Qt can't implicitly convert a std::string to a QVarianttemplate <>-void Config::WriteBasicSetting(const Settings::BasicSetting<std::string>& setting) {+void Config::WriteBasicSetting(const Settings::Setting<std::string>& setting) {const QString name = QString::fromStdString(setting.GetLabel());const std::string& value = setting.GetValue();qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());@@ -165,7 +165,7 @@ void Config::WriteBasicSetting(const Settings::BasicSetting<std::string>& settin}template <typename Type>-void Config::WriteBasicSetting(const Settings::BasicSetting<Type>& setting) {+void Config::WriteBasicSetting(const Settings::Setting<Type>& setting) {const QString name = QString::fromStdString(setting.GetLabel());const Type value = setting.GetValue();qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault());@@ -173,7 +173,7 @@ void Config::WriteBasicSetting(const Settings::BasicSetting<Type>& setting) {}template <typename Type>-void Config::WriteGlobalSetting(const Settings::Setting<Type>& setting) {+void Config::WriteGlobalSetting(const Settings::SwitchableSetting<Type>& setting) {const QString name = QString::fromStdString(setting.GetLabel());const Type& value = setting.GetValue(global);if (!global) {@@ -1422,7 +1422,7 @@ QVariant Config::ReadSetting(const QString& name, const QVariant& default_value)}template <typename Type>-void Config::ReadGlobalSetting(Settings::Setting<Type>& setting) {+void Config::ReadGlobalSetting(Settings::SwitchableSetting<Type>& setting) {QString name = QString::fromStdString(setting.GetLabel());const bool use_global = qt_config->value(name + QStringLiteral("/use_global"), true).toBool();setting.SetGlobal(use_global);diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.hindex f0ab6bdaab..9ca878d232 100644--- a/src/yuzu/configuration/config.h+++ b/src/yuzu/configuration/config.h@@ -160,7 +160,7 @@ private:* @param The setting*/template <typename Type>- void ReadGlobalSetting(Settings::Setting<Type>& setting);+ void ReadGlobalSetting(Settings::SwitchableSetting<Type>& setting);/*** Sets a value to the qt_config using the setting's label and default value. If the config is a@@ -169,7 +169,7 @@ private:* @param The setting*/template <typename Type>- void WriteGlobalSetting(const Settings::Setting<Type>& setting);+ void WriteGlobalSetting(const Settings::SwitchableSetting<Type>& setting);/*** Reads a value from the qt_config using the setting's label and default value and applies the@@ -178,14 +178,14 @@ private:* @param The setting*/template <typename Type>- void ReadBasicSetting(Settings::BasicSetting<Type>& setting);+ void ReadBasicSetting(Settings::Setting<Type>& setting);/** Sets a value from the setting in the qt_config using the setting's label and default value.** @param The setting*/template <typename Type>- void WriteBasicSetting(const Settings::BasicSetting<Type>& setting);+ void WriteBasicSetting(const Settings::Setting<Type>& setting);ConfigType type;std::unique_ptr<QSettings> qt_config;diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cppindex 5190bd18b1..dd4959417b 100644--- a/src/yuzu/configuration/configuration_shared.cpp+++ b/src/yuzu/configuration/configuration_shared.cpp@@ -9,7 +9,7 @@#include "yuzu/configuration/configuration_shared.h"#include "yuzu/configuration/configure_per_game.h"-void ConfigurationShared::ApplyPerGameSetting(Settings::Setting<bool>* setting,+void ConfigurationShared::ApplyPerGameSetting(Settings::SwitchableSetting<bool>* setting,const QCheckBox* checkbox,const CheckState& tracker) {if (Settings::IsConfiguringGlobal() && setting->UsingGlobal()) {@@ -25,7 +25,7 @@ void ConfigurationShared::ApplyPerGameSetting(Settings::Setting<bool>* setting,}void ConfigurationShared::SetPerGameSetting(QCheckBox* checkbox,- const Settings::Setting<bool>* setting) {+ const Settings::SwitchableSetting<bool>* setting) {if (setting->UsingGlobal()) {checkbox->setCheckState(Qt::PartiallyChecked);} else {@@ -45,7 +45,7 @@ void ConfigurationShared::SetHighlight(QWidget* widget, bool highlighted) {}void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox,- const Settings::Setting<bool>& setting,+ const Settings::SwitchableSetting<bool>& setting,CheckState& tracker) {if (setting.UsingGlobal()) {tracker = CheckState::Global;diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.hindex 903a9baae9..77802a367b 100644--- a/src/yuzu/configuration/configuration_shared.h+++ b/src/yuzu/configuration/configuration_shared.h@@ -25,10 +25,10 @@ enum class CheckState {// Global-aware apply and set functions// ApplyPerGameSetting, given a Settings::Setting and a Qt UI element, properly applies a Setting-void ApplyPerGameSetting(Settings::Setting<bool>* setting, const QCheckBox* checkbox,+void ApplyPerGameSetting(Settings::SwitchableSetting<bool>* setting, const QCheckBox* checkbox,const CheckState& tracker);template <typename Type>-void ApplyPerGameSetting(Settings::Setting<Type>* setting, const QComboBox* combobox) {+void ApplyPerGameSetting(Settings::SwitchableSetting<Type>* setting, const QComboBox* combobox) {if (Settings::IsConfiguringGlobal() && setting->UsingGlobal()) {setting->SetValue(static_cast<Type>(combobox->currentIndex()));} else if (!Settings::IsConfiguringGlobal()) {@@ -43,10 +43,10 @@ void ApplyPerGameSetting(Settings::Setting<Type>* setting, const QComboBox* comb}// Sets a Qt UI element given a Settings::Setting-void SetPerGameSetting(QCheckBox* checkbox, const Settings::Setting<bool>* setting);+void SetPerGameSetting(QCheckBox* checkbox, const Settings::SwitchableSetting<bool>* setting);template <typename Type>-void SetPerGameSetting(QComboBox* combobox, const Settings::Setting<Type>* setting) {+void SetPerGameSetting(QComboBox* combobox, const Settings::SwitchableSetting<Type>* setting) {combobox->setCurrentIndex(setting->UsingGlobal() ? ConfigurationShared::USE_GLOBAL_INDEX: static_cast<int>(setting->GetValue()) +ConfigurationShared::USE_GLOBAL_OFFSET);@@ -56,7 +56,7 @@ void SetPerGameSetting(QComboBox* combobox, const Settings::Setting<Type>* settivoid SetHighlight(QWidget* widget, bool highlighted);// Sets up a QCheckBox like a tristate one, given a Setting-void SetColoredTristate(QCheckBox* checkbox, const Settings::Setting<bool>& setting,+void SetColoredTristate(QCheckBox* checkbox, const Settings::SwitchableSetting<bool>& setting,CheckState& tracker);void SetColoredTristate(QCheckBox* checkbox, bool global, bool state, bool global_state,CheckState& tracker);diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.hindex c64d87acea..044d88ca6a 100644--- a/src/yuzu/uisettings.h+++ b/src/yuzu/uisettings.h@@ -64,28 +64,28 @@ struct Values {QByteArray gamelist_header_state;QByteArray microprofile_geometry;- Settings::BasicSetting<bool> microprofile_visible{false, "microProfileDialogVisible"};-- Settings::BasicSetting<bool> single_window_mode{true, "singleWindowMode"};- Settings::BasicSetting<bool> fullscreen{false, "fullscreen"};- Settings::BasicSetting<bool> display_titlebar{true, "displayTitleBars"};- Settings::BasicSetting<bool> show_filter_bar{true, "showFilterBar"};- Settings::BasicSetting<bool> show_status_bar{true, "showStatusBar"};-- Settings::BasicSetting<bool> confirm_before_closing{true, "confirmClose"};- Settings::BasicSetting<bool> first_start{true, "firstStart"};- Settings::BasicSetting<bool> pause_when_in_background{false, "pauseWhenInBackground"};- Settings::BasicSetting<bool> mute_when_in_background{false, "muteWhenInBackground"};- Settings::BasicSetting<bool> hide_mouse{true, "hideInactiveMouse"};+ Settings::Setting<bool> microprofile_visible{false, "microProfileDialogVisible"};++ Settings::Setting<bool> single_window_mode{true, "singleWindowMode"};+ Settings::Setting<bool> fullscreen{false, "fullscreen"};+ Settings::Setting<bool> display_titlebar{true, "displayTitleBars"};+ Settings::Setting<bool> show_filter_bar{true, "showFilterBar"};+ Settings::Setting<bool> show_status_bar{true, "showStatusBar"};++ Settings::Setting<bool> confirm_before_closing{true, "confirmClose"};+ Settings::Setting<bool> first_start{true, "firstStart"};+ Settings::Setting<bool> pause_when_in_background{false, "pauseWhenInBackground"};+ Settings::Setting<bool> mute_when_in_background{false, "muteWhenInBackground"};+ Settings::Setting<bool> hide_mouse{true, "hideInactiveMouse"};// Set when Vulkan is known to crash the application- Settings::BasicSetting<bool> has_broken_vulkan{false, "has_broken_vulkan"};+ Settings::Setting<bool> has_broken_vulkan{false, "has_broken_vulkan"};- Settings::BasicSetting<bool> select_user_on_boot{false, "select_user_on_boot"};+ Settings::Setting<bool> select_user_on_boot{false, "select_user_on_boot"};// Discord RPC- Settings::BasicSetting<bool> enable_discord_presence{true, "enable_discord_presence"};+ Settings::Setting<bool> enable_discord_presence{true, "enable_discord_presence"};- Settings::BasicSetting<bool> enable_screenshot_save_as{true, "enable_screenshot_save_as"};+ Settings::Setting<bool> enable_screenshot_save_as{true, "enable_screenshot_save_as"};QString roms_path;QString symbols_path;@@ -100,25 +100,25 @@ struct Values {// Shortcut name <Shortcut, context>std::vector<Shortcut> shortcuts;- Settings::BasicSetting<uint32_t> callout_flags{0, "calloutFlags"};+ Settings::Setting<uint32_t> callout_flags{0, "calloutFlags"};// logging- Settings::BasicSetting<bool> show_console{false, "showConsole"};+ Settings::Setting<bool> show_console{false, "showConsole"};// Game List- Settings::BasicSetting<bool> show_add_ons{true, "show_add_ons"};- Settings::BasicSetting<uint32_t> game_icon_size{64, "game_icon_size"};- Settings::BasicSetting<uint32_t> folder_icon_size{48, "folder_icon_size"};- Settings::BasicSetting<uint8_t> row_1_text_id{3, "row_1_text_id"};- Settings::BasicSetting<uint8_t> row_2_text_id{2, "row_2_text_id"};+ Settings::Setting<bool> show_add_ons{true, "show_add_ons"};+ Settings::Setting<uint32_t> game_icon_size{64, "game_icon_size"};+ Settings::Setting<uint32_t> folder_icon_size{48, "folder_icon_size"};+ Settings::Setting<uint8_t> row_1_text_id{3, "row_1_text_id"};+ Settings::Setting<uint8_t> row_2_text_id{2, "row_2_text_id"};std::atomic_bool is_game_list_reload_pending{false};- Settings::BasicSetting<bool> cache_game_list{true, "cache_game_list"};- Settings::BasicSetting<bool> favorites_expanded{true, "favorites_expanded"};+ Settings::Setting<bool> cache_game_list{true, "cache_game_list"};+ Settings::Setting<bool> favorites_expanded{true, "favorites_expanded"};QVector<u64> favorited_ids;bool configuration_applied;bool reset_to_defaults;- Settings::BasicSetting<bool> disable_web_applet{true, "disable_web_applet"};+ Settings::Setting<bool> disable_web_applet{true, "disable_web_applet"};};extern Values values;diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cppindex fc4744fb02..903e022972 100644--- a/src/yuzu_cmd/config.cpp+++ b/src/yuzu_cmd/config.cpp@@ -90,17 +90,17 @@ static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs>}};template <>-void Config::ReadSetting(const std::string& group, Settings::BasicSetting<std::string>& setting) {+void Config::ReadSetting(const std::string& group, Settings::Setting<std::string>& setting) {setting = sdl2_config->Get(group, setting.GetLabel(), setting.GetDefault());}template <>-void Config::ReadSetting(const std::string& group, Settings::BasicSetting<bool>& setting) {+void Config::ReadSetting(const std::string& group, Settings::Setting<bool>& setting) {setting = sdl2_config->GetBoolean(group, setting.GetLabel(), setting.GetDefault());}template <typename Type>-void Config::ReadSetting(const std::string& group, Settings::BasicSetting<Type>& setting) {+void Config::ReadSetting(const std::string& group, Settings::Setting<Type>& setting) {setting = static_cast<Type>(sdl2_config->GetInteger(group, setting.GetLabel(),static_cast<long>(setting.GetDefault())));}diff --git a/src/yuzu_cmd/config.h b/src/yuzu_cmd/config.hindex f61ba23ecf..ccf77d6684 100644--- a/src/yuzu_cmd/config.h+++ b/src/yuzu_cmd/config.h@@ -28,11 +28,11 @@ public:private:/**- * Applies a value read from the sdl2_config to a BasicSetting.+ * Applies a value read from the sdl2_config to a Setting.** @param group The name of the INI group* @param setting The yuzu setting to modify*/template <typename Type>- void ReadSetting(const std::string& group, Settings::BasicSetting<Type>& setting);+ void ReadSetting(const std::string& group, Settings::Setting<Type>& setting);};