From 5cffa342884df531d911555f7b3db9d2f6d1d1f0 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 3 May 2023 20:42:33 -0400
Subject: settings,video_core: Consolidate ASTC decoding options

Just puts them all neatly into one place.
---
 src/common/settings.cpp |  2 --
 src/common/settings.h   | 11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 5972480e5..3f56afe94 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -82,7 +82,6 @@ void LogSettings() {
                 values.use_asynchronous_gpu_emulation.GetValue());
     log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue());
     log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue());
-    log_setting("Renderer_AsyncASTC", values.async_astc.GetValue());
     log_setting("Renderer_AstcRecompression", values.astc_recompression.GetValue());
     log_setting("Renderer_UseVsync", values.vsync_mode.GetValue());
     log_setting("Renderer_UseReactiveFlushing", values.use_reactive_flushing.GetValue());
@@ -246,7 +245,6 @@ void RestoreGlobalState(bool is_powered_on) {
     values.use_asynchronous_gpu_emulation.SetGlobal(true);
     values.nvdec_emulation.SetGlobal(true);
     values.accelerate_astc.SetGlobal(true);
-    values.async_astc.SetGlobal(true);
     values.astc_recompression.SetGlobal(true);
     values.use_reactive_flushing.SetGlobal(true);
     values.shader_backend.SetGlobal(true);
diff --git a/src/common/settings.h b/src/common/settings.h
index 59e96e74f..b8ab34f7f 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -16,6 +16,12 @@
 
 namespace Settings {
 
+enum class AstcDecodeMode : u32 {
+    CPU = 0,
+    GPU = 1,
+    CPUAsynchronous = 2,
+};
+
 enum class VSyncMode : u32 {
     Immediate = 0,
     Mailbox = 1,
@@ -467,8 +473,9 @@ struct Values {
                                                       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> async_astc{false, "async_astc"};
+    SwitchableSetting<AstcDecodeMode, true> accelerate_astc{
+        AstcDecodeMode::CPU, AstcDecodeMode::CPU, AstcDecodeMode::CPUAsynchronous,
+        "accelerate_astc"};
     Setting<VSyncMode, true> vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate,
                                         VSyncMode::FIFORelaxed, "use_vsync"};
     SwitchableSetting<bool> use_reactive_flushing{true, "use_reactive_flushing"};
-- 
cgit v1.2.3


From 5ccfaf0517ed365e64458783b30f521d3ed21c78 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Thu, 4 May 2023 03:44:53 -0400
Subject: settings: Pool SetGlobal functions

---
 src/common/settings.cpp | 63 ++++---------------------------------------------
 src/common/settings.h   | 12 ++++++++--
 2 files changed, 14 insertions(+), 61 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 3f56afe94..e3f30f7e3 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -7,6 +7,7 @@
 #include <exception>
 #include <stdexcept>
 #endif
+#include <functional>
 #include <string_view>
 
 #include "common/assert.h"
@@ -210,65 +211,9 @@ void RestoreGlobalState(bool is_powered_on) {
         return;
     }
 
-    // Audio
-    values.volume.SetGlobal(true);
-
-    // Core
-    values.use_multi_core.SetGlobal(true);
-    values.use_unsafe_extended_memory_layout.SetGlobal(true);
-
-    // CPU
-    values.cpu_accuracy.SetGlobal(true);
-    values.cpuopt_unsafe_unfuse_fma.SetGlobal(true);
-    values.cpuopt_unsafe_reduce_fp_error.SetGlobal(true);
-    values.cpuopt_unsafe_ignore_standard_fpcr.SetGlobal(true);
-    values.cpuopt_unsafe_inaccurate_nan.SetGlobal(true);
-    values.cpuopt_unsafe_fastmem_check.SetGlobal(true);
-    values.cpuopt_unsafe_ignore_global_monitor.SetGlobal(true);
-
-    // Renderer
-    values.fsr_sharpening_slider.SetGlobal(true);
-    values.renderer_backend.SetGlobal(true);
-    values.async_presentation.SetGlobal(true);
-    values.renderer_force_max_clock.SetGlobal(true);
-    values.vulkan_device.SetGlobal(true);
-    values.fullscreen_mode.SetGlobal(true);
-    values.aspect_ratio.SetGlobal(true);
-    values.resolution_setup.SetGlobal(true);
-    values.scaling_filter.SetGlobal(true);
-    values.anti_aliasing.SetGlobal(true);
-    values.max_anisotropy.SetGlobal(true);
-    values.use_speed_limit.SetGlobal(true);
-    values.speed_limit.SetGlobal(true);
-    values.use_disk_shader_cache.SetGlobal(true);
-    values.gpu_accuracy.SetGlobal(true);
-    values.use_asynchronous_gpu_emulation.SetGlobal(true);
-    values.nvdec_emulation.SetGlobal(true);
-    values.accelerate_astc.SetGlobal(true);
-    values.astc_recompression.SetGlobal(true);
-    values.use_reactive_flushing.SetGlobal(true);
-    values.shader_backend.SetGlobal(true);
-    values.use_asynchronous_shaders.SetGlobal(true);
-    values.use_fast_gpu_time.SetGlobal(true);
-    values.use_vulkan_driver_pipeline_cache.SetGlobal(true);
-    values.bg_red.SetGlobal(true);
-    values.bg_green.SetGlobal(true);
-    values.bg_blue.SetGlobal(true);
-    values.enable_compute_pipelines.SetGlobal(true);
-    values.use_video_framerate.SetGlobal(true);
-
-    // System
-    values.language_index.SetGlobal(true);
-    values.region_index.SetGlobal(true);
-    values.time_zone_index.SetGlobal(true);
-    values.rng_seed.SetGlobal(true);
-    values.sound_index.SetGlobal(true);
-
-    // Controls
-    values.players.SetGlobal(true);
-    values.use_docked_mode.SetGlobal(true);
-    values.vibration_enabled.SetGlobal(true);
-    values.motion_enabled.SetGlobal(true);
+    for (const auto& reset : global_reset_registry) {
+        reset();
+    }
 }
 
 } // namespace Settings
diff --git a/src/common/settings.h b/src/common/settings.h
index b8ab34f7f..61d15467d 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -5,6 +5,8 @@
 
 #include <algorithm>
 #include <array>
+#include <forward_list>
+#include <functional>
 #include <map>
 #include <optional>
 #include <string>
@@ -125,6 +127,8 @@ struct ResolutionScalingInfo {
     }
 };
 
+static std::forward_list<std::function<void()>> global_reset_registry;
+
 /** 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
@@ -255,7 +259,9 @@ public:
      */
     explicit SwitchableSetting(const Type& default_val, const std::string& name)
         requires(!ranged)
-        : Setting<Type>{default_val, name} {}
+        : Setting<Type>{default_val, name} {
+        global_reset_registry.push_front([this]() { this->SetGlobal(true); });
+    }
     virtual ~SwitchableSetting() = default;
 
     /**
@@ -269,7 +275,9 @@ public:
     explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val,
                                const std::string& name)
         requires(ranged)
-        : Setting<Type, true>{default_val, min_val, max_val, name} {}
+        : Setting<Type, true>{default_val, min_val, max_val, name} {
+        global_reset_registry.push_front([this]() { this->SetGlobal(true); });
+    }
 
     /**
      * Tells this setting to represent either the global or custom setting when other member
-- 
cgit v1.2.3


From 413316560784348b8ea2684d272b974fd0428267 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 5 Jun 2023 20:41:50 -0400
Subject: settings,core,config_sys: Remove optional type from custom_rtc,
 rng_seed

core: Fix MSVC errors
---
 src/common/settings.cpp                     |  3 ++-
 src/common/settings.h                       |  6 +++--
 src/core/core.cpp                           |  4 ++-
 src/core/hle/kernel/k_process.cpp           |  3 ++-
 src/core/hle/service/spl/spl_module.cpp     |  3 ++-
 src/yuzu/configuration/configure_system.cpp | 40 ++++++++++++++---------------
 6 files changed, 33 insertions(+), 26 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e3f30f7e3..696929479 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -62,7 +62,8 @@ void LogSettings() {
 
     LOG_INFO(Config, "yuzu Configuration:");
     log_setting("Controls_UseDockedMode", values.use_docked_mode.GetValue());
-    log_setting("System_RngSeed", values.rng_seed.GetValue().value_or(0));
+    log_setting("System_RngSeedEnabled", values.rng_seed_enabled.GetValue());
+    log_setting("System_RngSeed", values.rng_seed.GetValue());
     log_setting("System_DeviceName", values.device_name.GetValue());
     log_setting("System_CurrentUser", values.current_user.GetValue());
     log_setting("System_LanguageIndex", values.language_index.GetValue());
diff --git a/src/common/settings.h b/src/common/settings.h
index 61d15467d..999f8b5be 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -505,10 +505,12 @@ struct Values {
     SwitchableSetting<u8> bg_blue{0, "bg_blue"};
 
     // System
-    SwitchableSetting<std::optional<u32>> rng_seed{std::optional<u32>(), "rng_seed"};
+    SwitchableSetting<bool> rng_seed_enabled{false, "rng_seed_enabled"};
+    SwitchableSetting<u32> rng_seed{0, "rng_seed"};
     Setting<std::string> device_name{"Yuzu", "device_name"};
     // Measured in seconds since epoch
-    std::optional<s64> custom_rtc;
+    SwitchableSetting<bool> custom_rtc_enabled{false, "custom_rtc_enabled"};
+    SwitchableSetting<s64> custom_rtc{0, "custom_rtc"};
     // Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`
     s64 custom_rtc_differential;
 
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 9e3eb3795..da1baa892 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -149,7 +149,9 @@ struct System::Impl {
         const auto current_time =
             std::chrono::duration_cast<std::chrono::seconds>(posix_time).count();
         Settings::values.custom_rtc_differential =
-            Settings::values.custom_rtc.value_or(current_time) - current_time;
+            (Settings::values.custom_rtc_enabled ? Settings::values.custom_rtc.GetValue()
+                                                 : current_time) -
+            current_time;
 
         // Create a default fs if one doesn't already exist.
         if (virtual_filesystem == nullptr) {
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp
index efe86ad27..ae064ee04 100644
--- a/src/core/hle/kernel/k_process.cpp
+++ b/src/core/hle/kernel/k_process.cpp
@@ -81,7 +81,8 @@ Result KProcess::Initialize(KProcess* process, Core::System& system, std::string
     process->m_capabilities.InitializeForMetadatalessProcess();
     process->m_is_initialized = true;
 
-    std::mt19937 rng(Settings::values.rng_seed.GetValue().value_or(std::time(nullptr)));
+    std::mt19937 rng(Settings::values.rng_seed_enabled ? Settings::values.rng_seed.GetValue()
+                                                       : static_cast<u32>(std::time(nullptr)));
     std::uniform_int_distribution<u64> distribution;
     std::generate(process->m_random_entropy.begin(), process->m_random_entropy.end(),
                   [&] { return distribution(rng); });
diff --git a/src/core/hle/service/spl/spl_module.cpp b/src/core/hle/service/spl/spl_module.cpp
index 0227d4393..cd631b2ea 100644
--- a/src/core/hle/service/spl/spl_module.cpp
+++ b/src/core/hle/service/spl/spl_module.cpp
@@ -19,7 +19,8 @@ namespace Service::SPL {
 Module::Interface::Interface(Core::System& system_, std::shared_ptr<Module> module_,
                              const char* name)
     : ServiceFramework{system_, name}, module{std::move(module_)},
-      rng(Settings::values.rng_seed.GetValue().value_or(std::time(nullptr))) {}
+      rng(Settings::values.rng_seed_enabled ? Settings::values.rng_seed.GetValue()
+                                            : static_cast<u32>(std::time(nullptr))) {}
 
 Module::Interface::~Interface() = default;
 
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index f1ae312c6..c892635b8 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -95,19 +95,20 @@ void ConfigureSystem::RetranslateUI() {
 
 void ConfigureSystem::SetConfiguration() {
     enabled = !system.IsPoweredOn();
-    const auto rng_seed =
-        QStringLiteral("%1")
-            .arg(Settings::values.rng_seed.GetValue().value_or(0), 8, 16, QLatin1Char{'0'})
-            .toUpper();
-    const auto rtc_time = Settings::values.custom_rtc.value_or(QDateTime::currentSecsSinceEpoch());
-
-    ui->rng_seed_checkbox->setChecked(Settings::values.rng_seed.GetValue().has_value());
-    ui->rng_seed_edit->setEnabled(Settings::values.rng_seed.GetValue().has_value() &&
+    const auto rng_seed = QStringLiteral("%1")
+                              .arg(Settings::values.rng_seed.GetValue(), 8, 16, QLatin1Char{'0'})
+                              .toUpper();
+    const auto rtc_time = Settings::values.custom_rtc_enabled
+                              ? Settings::values.custom_rtc.GetValue()
+                              : QDateTime::currentSecsSinceEpoch();
+
+    ui->rng_seed_checkbox->setChecked(Settings::values.rng_seed_enabled.GetValue());
+    ui->rng_seed_edit->setEnabled(Settings::values.rng_seed_enabled.GetValue() &&
                                   Settings::values.rng_seed.UsingGlobal());
     ui->rng_seed_edit->setText(rng_seed);
 
-    ui->custom_rtc_checkbox->setChecked(Settings::values.custom_rtc.has_value());
-    ui->custom_rtc_edit->setEnabled(Settings::values.custom_rtc.has_value());
+    ui->custom_rtc_checkbox->setChecked(Settings::values.custom_rtc_enabled.GetValue());
+    ui->custom_rtc_edit->setEnabled(Settings::values.custom_rtc_enabled.GetValue());
     ui->custom_rtc_edit->setDateTime(QDateTime::fromSecsSinceEpoch(rtc_time));
     ui->device_name_edit->setText(
         QString::fromUtf8(Settings::values.device_name.GetValue().c_str()));
@@ -142,13 +143,15 @@ void ConfigureSystem::ApplyConfiguration() {
     // to allow in-game time to be fast forwarded
     if (Settings::IsConfiguringGlobal()) {
         if (ui->custom_rtc_checkbox->isChecked()) {
+            Settings::values.custom_rtc_enabled = true;
             Settings::values.custom_rtc = ui->custom_rtc_edit->dateTime().toSecsSinceEpoch();
             if (system.IsPoweredOn()) {
-                const s64 posix_time{*Settings::values.custom_rtc};
+                const s64 posix_time{Settings::values.custom_rtc.GetValue() +
+                                     Service::Time::TimeManager::GetExternalTimeZoneOffset()};
                 system.GetTimeManager().UpdateLocalSystemClockTime(posix_time);
             }
         } else {
-            Settings::values.custom_rtc = std::nullopt;
+            Settings::values.custom_rtc_enabled = false;
         }
     }
 
@@ -169,26 +172,23 @@ void ConfigureSystem::ApplyConfiguration() {
     if (Settings::IsConfiguringGlobal()) {
         // Guard if during game and set to game-specific value
         if (Settings::values.rng_seed.UsingGlobal()) {
+            Settings::values.rng_seed_enabled = ui->rng_seed_checkbox->isChecked();
             if (ui->rng_seed_checkbox->isChecked()) {
                 Settings::values.rng_seed.SetValue(ui->rng_seed_edit->text().toUInt(nullptr, 16));
-            } else {
-                Settings::values.rng_seed.SetValue(std::nullopt);
             }
         }
     } else {
         switch (use_rng_seed) {
         case ConfigurationShared::CheckState::On:
         case ConfigurationShared::CheckState::Off:
+            Settings::values.rng_seed_enabled.SetGlobal(false);
             Settings::values.rng_seed.SetGlobal(false);
             if (ui->rng_seed_checkbox->isChecked()) {
                 Settings::values.rng_seed.SetValue(ui->rng_seed_edit->text().toUInt(nullptr, 16));
-            } else {
-                Settings::values.rng_seed.SetValue(std::nullopt);
             }
             break;
         case ConfigurationShared::CheckState::Global:
-            Settings::values.rng_seed.SetGlobal(false);
-            Settings::values.rng_seed.SetValue(std::nullopt);
+            Settings::values.rng_seed_enabled.SetGlobal(true);
             Settings::values.rng_seed.SetGlobal(true);
             break;
         case ConfigurationShared::CheckState::Count:
@@ -217,8 +217,8 @@ void ConfigureSystem::SetupPerGameUI() {
 
     ConfigurationShared::SetColoredTristate(
         ui->rng_seed_checkbox, Settings::values.rng_seed.UsingGlobal(),
-        Settings::values.rng_seed.GetValue().has_value(),
-        Settings::values.rng_seed.GetValue(true).has_value(), use_rng_seed);
+        Settings::values.rng_seed_enabled.GetValue(),
+        Settings::values.rng_seed_enabled.GetValue(true), use_rng_seed);
 
     ConfigurationShared::SetColoredTristate(ui->use_unsafe_extended_memory_layout,
                                             Settings::values.use_unsafe_extended_memory_layout,
-- 
cgit v1.2.3


From 60773194a039fced8cf2da308e1b8220d08a1636 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 5 Jun 2023 21:05:22 -0400
Subject: settings: Add a registry of settings

LoadString: Sanitize input

settings: Handle empty string, remove redundant category

settings: Rename Input to Controls, FS to DataStorage

settings: Fix Controls groups information

settings: Move use_docked_mode to System (again)

settings: Document

settings: Add type identification function

settings: Move registry into values

settings: Move global_reset_registry into values

settings: Separate AdvGraphics from Renderer

settings: More document

squash

settings: Use linkage object

uisettings: Move registry into settings

Probably wont build without

uisettings: Use settings linkage object

config: Load settings with a map

Uses the new all_settings vector to load settings.

qt-config: Rename settings category

qt config: Rename to read category

config: Read/write contols category with for_each

This is extremely limited due to the complexity of the Controls group,
but this handles the the settings that use the interface.

qt-config: Use new settings registry

qt-config: Read/write advgrphics

qt-config: Use settings linkage object

yuzu_cmd: Load setting off of vector

cmd-config: Finish settings rename

config: Read controls settings group with for_each

cmd/config: Move registry into values

cmd: Read adv graphics

cmd-config: Use settings linkage object
---
 src/common/settings.cpp                         |  52 +-
 src/common/settings.h                           | 620 +++++++++++++++++-------
 src/yuzu/configuration/config.cpp               | 586 ++++------------------
 src/yuzu/configuration/config.h                 |  13 +-
 src/yuzu/configuration/configuration_shared.cpp |  19 -
 src/yuzu/configuration/configuration_shared.h   |  22 +-
 src/yuzu/uisettings.h                           |  90 ++--
 src/yuzu_cmd/config.cpp                         | 167 ++-----
 src/yuzu_cmd/config.h                           |   1 +
 9 files changed, 700 insertions(+), 870 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 696929479..59934803e 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -144,6 +144,56 @@ float Volume() {
     return values.volume.GetValue() / static_cast<f32>(values.volume.GetDefault());
 }
 
+const char* TranslateCategory(Category category) {
+    switch (category) {
+    case Category::Audio:
+        return "Audio";
+    case Category::Core:
+        return "Core";
+    case Category::Cpu:
+        return "Cpu";
+    case Category::Renderer:
+        return "Renderer";
+    case Category::System:
+        return "System";
+    case Category::DataStorage:
+        return "Data Storage";
+    case Category::Debugging:
+        return "Debugging";
+    case Category::Miscellaneous:
+        return "Miscellaneous";
+    case Category::Network:
+        return "Network";
+    case Category::WebService:
+        return "WebService";
+    case Category::AddOns:
+        return "DisabledAddOns";
+    case Category::Controls:
+        return "Controls";
+    case Category::Ui:
+        return "UI";
+    case Category::UiLayout:
+        return "UiLayout";
+    case Category::UiGameList:
+        return "UiGameList";
+    case Category::Screenshots:
+        return "Screenshots";
+    case Category::Shortcuts:
+        return "Shortcuts";
+    case Category::Multiplayer:
+        return "Multiplayer";
+    case Category::Services:
+        return "Services";
+    case Category::Paths:
+        return "Paths";
+    case Category::MaxEnum:
+        break;
+    case Category::AdvancedGraphics:
+        return "Renderer";
+    }
+    return "Miscellaneous";
+}
+
 void UpdateRescalingInfo() {
     const auto setup = values.resolution_setup.GetValue();
     auto& info = values.resolution_info;
@@ -212,7 +262,7 @@ void RestoreGlobalState(bool is_powered_on) {
         return;
     }
 
-    for (const auto& reset : global_reset_registry) {
+    for (const auto& reset : values.linkage.restore_functions) {
         reset();
     }
 }
diff --git a/src/common/settings.h b/src/common/settings.h
index 999f8b5be..df4bcb053 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -9,7 +9,9 @@
 #include <functional>
 #include <map>
 #include <optional>
+#include <stdexcept>
 #include <string>
+#include <typeindex>
 #include <utility>
 #include <vector>
 
@@ -104,6 +106,33 @@ enum class AstcRecompression : u32 {
     Bc3 = 2,
 };
 
+enum class Category : u32 {
+    Audio,
+    Core,
+    Cpu,
+    Renderer,
+    AdvancedGraphics,
+    System,
+    DataStorage,
+    Debugging,
+    Miscellaneous,
+    Network,
+    WebService,
+    AddOns,
+    Controls,
+    Ui,
+    UiLayout,
+    UiGameList,
+    Screenshots,
+    Shortcuts,
+    Multiplayer,
+    Services,
+    Paths,
+    MaxEnum,
+};
+
+const char* TranslateCategory(Settings::Category category);
+
 struct ResolutionScalingInfo {
     u32 up_scale{1};
     u32 down_shift{0};
@@ -127,15 +156,40 @@ struct ResolutionScalingInfo {
     }
 };
 
-static std::forward_list<std::function<void()>> global_reset_registry;
+class BasicSetting {
+protected:
+    explicit BasicSetting() = default;
+
+public:
+    virtual ~BasicSetting() = default;
+
+    virtual Category Category() const = 0;
+    virtual constexpr bool Switchable() const = 0;
+    virtual std::string ToString() const = 0;
+    virtual void LoadString(const std::string& load) = 0;
+    virtual const std::string& GetLabel() const = 0;
+    virtual std::string DefaultToString() const = 0;
+    virtual bool Save() const = 0;
+    virtual std::type_index TypeId() const = 0;
+    virtual void SetGlobal(bool global) {}
+    virtual bool UsingGlobal() const {
+        return false;
+    }
+};
+
+class Linkage {
+public:
+    std::map<Category, std::forward_list<BasicSetting*>> by_category;
+    std::vector<std::function<void()>> restore_functions;
+};
 
-/** 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.
+/** 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, bool ranged = false>
-class Setting {
+template <typename Type, bool ranged = false, bool save = true>
+class Setting : public BasicSetting {
 protected:
     Setting() = default;
 
@@ -151,27 +205,36 @@ public:
     /**
      * Sets a default value, label, and setting value.
      *
+     * @param linkage Setting registry
      * @param default_val Initial value of the setting, and default value of the setting
      * @param name Label for the setting
+     * @param category_ Category of the setting AKA INI group
      */
-    explicit Setting(const Type& default_val, const std::string& name)
+    explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
+                     enum Category category_)
         requires(!ranged)
-        : value{default_val}, default_value{default_val}, label{name} {}
+        : value{default_val}, default_value{default_val}, label{name}, category{category_} {
+        linkage.by_category[category].push_front(this);
+    }
     virtual ~Setting() = default;
 
     /**
      * Sets a default value, minimum value, maximum value, and label.
      *
+     * @param linkage Setting registry
      * @param default_val Initial 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
+     * @param category_ Category of the setting AKA INI group
      */
-    explicit Setting(const Type& default_val, const Type& min_val, const Type& max_val,
-                     const std::string& name)
+    explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
+                     const Type& max_val, const std::string& name, enum Category category_)
         requires(ranged)
-        : value{default_val},
-          default_value{default_val}, maximum{max_val}, minimum{min_val}, label{name} {}
+        : value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val},
+          label{name}, category{category_} {
+        linkage.by_category[category].push_front(this);
+    }
 
     /**
      *  Returns a reference to the setting's value.
@@ -206,10 +269,61 @@ public:
      *
      * @returns A reference to the label
      */
-    [[nodiscard]] const std::string& GetLabel() const {
+    [[nodiscard]] const std::string& GetLabel() const override {
         return label;
     }
 
+    /**
+     * Returns the setting's category AKA INI group.
+     *
+     * @returns The setting's category
+     */
+    [[nodiscard]] enum Category Category() const override {
+        return category;
+    }
+
+    /**
+     * Returns whether the current setting is Switchable.
+     *
+     * @returns If the setting is a SwitchableSetting
+     */
+    [[nodiscard]] virtual constexpr bool Switchable() const override {
+        return false;
+    }
+
+private:
+    std::string ToString(const Type& value_) const {
+        if constexpr (std::is_same<Type, std::string>()) {
+            return value_;
+        } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
+            return value_.has_value() ? std::to_string(*value_) : "0";
+        } else if constexpr (std::is_same<Type, bool>()) {
+            return value_ ? "true" : "false";
+        } else {
+            return std::to_string(static_cast<u64>(value_));
+        }
+    }
+
+public:
+    /**
+     * Converts the value of the setting to a std::string. Respects the global state if the setting
+     * has one.
+     *
+     * @returns The current setting as a std::string
+     */
+    std::string ToString() const override {
+        return ToString(this->GetValue());
+    }
+
+    /**
+     * Returns the default value of the setting as a std::string.
+     *
+     * @returns The default value as a string.
+     */
+    std::string DefaultToString() const override {
+        return ToString(default_value);
+    }
+
     /**
      * Assigns a value to the setting.
      *
@@ -232,12 +346,58 @@ public:
         return value;
     }
 
+    /**
+     * Converts the given value to the Setting's type of value. Uses SetValue to enter the setting,
+     * thus respecting its constraints.
+     *
+     * @param input The desired value
+     */
+    void LoadString(const std::string& input) override {
+        if (input.empty()) {
+            this->SetValue(this->GetDefault());
+            return;
+        }
+        try {
+            if constexpr (std::is_same<Type, std::string>()) {
+                this->SetValue(input);
+            } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
+                this->SetValue(static_cast<u32>(std::stoll(input)));
+            } else if constexpr (std::is_same<Type, bool>()) {
+                this->SetValue(input == "true");
+            } else {
+                this->SetValue(static_cast<Type>(std::stoll(input)));
+            }
+        } catch (std::invalid_argument) {
+            this->SetValue(this->GetDefault());
+        }
+    }
+
+    /**
+     * Returns the save preference of the setting i.e. when saving or reading the setting from a
+     * frontend, whether this setting should be skipped.
+     *
+     * @returns The save preference
+     */
+    virtual bool Save() const override {
+        return save;
+    }
+
+    /**
+     * Gives us another way to identify the setting without having to go through a string.
+     *
+     * @returns the type_index of the setting's type
+     */
+    virtual std::type_index TypeId() const override {
+        return std::type_index(typeid(Type));
+    }
+
 protected:
-    Type value{};               ///< The setting
-    const Type default_value{}; ///< The default value
-    const Type maximum{};       ///< Maximum allowed value of the setting
-    const Type minimum{};       ///< Minimum allowed value of the setting
-    const std::string label{};  ///< The setting's label
+    Type value{};                 ///< The setting
+    const Type default_value{};   ///< The default value
+    const Type maximum{};         ///< Maximum allowed value of the setting
+    const Type minimum{};         ///< Minimum allowed value of the setting
+    const std::string label{};    ///< The setting's label
+    const enum Category category; ///< The setting's category AKA INI group
 };
 
 /**
@@ -248,35 +408,40 @@ protected:
  *
  * By default, the global setting is used.
  */
-template <typename Type, bool ranged = false>
-class SwitchableSetting : virtual public Setting<Type, ranged> {
+template <typename Type, bool ranged = false, bool save = true>
+class SwitchableSetting : virtual public Setting<Type, ranged, save> {
 public:
     /**
      * Sets a default value, label, and setting value.
      *
+     * @param linkage Setting registry
      * @param default_val Initial value of the setting, and default value of the setting
      * @param name Label for the setting
+     * @param category_ Category of the setting AKA INI group
      */
-    explicit SwitchableSetting(const Type& default_val, const std::string& name)
+    explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
+                               Category category)
         requires(!ranged)
-        : Setting<Type>{default_val, name} {
-        global_reset_registry.push_front([this]() { this->SetGlobal(true); });
+        : Setting<Type, false, save>{linkage, default_val, name, category} {
+        linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
     virtual ~SwitchableSetting() = default;
 
     /**
      * Sets a default value, minimum value, maximum value, and label.
      *
+     * @param linkage Setting registry
      * @param default_val Initial 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
+     * @param category_ Category of the setting AKA INI group
      */
-    explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val,
-                               const std::string& name)
+    explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
+                               const Type& max_val, const std::string& name, Category category)
         requires(ranged)
-        : Setting<Type, true>{default_val, min_val, max_val, name} {
-        global_reset_registry.push_front([this]() { this->SetGlobal(true); });
+        : Setting<Type, true, save>{linkage, default_val, min_val, max_val, name, category} {
+        linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
 
     /**
@@ -285,7 +450,7 @@ public:
      *
      * @param to_global Whether to use the global or custom setting.
      */
-    void SetGlobal(bool to_global) {
+    void SetGlobal(bool to_global) override {
         use_global = to_global;
     }
 
@@ -294,7 +459,7 @@ public:
      *
      * @returns The global state
      */
-    [[nodiscard]] bool UsingGlobal() const {
+    [[nodiscard]] bool UsingGlobal() const override {
         return use_global;
     }
 
@@ -333,6 +498,10 @@ public:
         }
     }
 
+    [[nodiscard]] virtual constexpr bool Switchable() const override {
+        return true;
+    }
+
     /**
      * Assigns the current setting value depending on the global state.
      *
@@ -405,211 +574,290 @@ struct TouchFromButtonMap {
 };
 
 struct Values {
+    Linkage linkage{};
+
     // Audio
-    Setting<std::string> sink_id{"auto", "output_engine"};
-    Setting<std::string> audio_output_device_id{"auto", "output_device"};
-    Setting<std::string> audio_input_device_id{"auto", "input_device"};
-    Setting<bool> audio_muted{false, "audio_muted"};
-    SwitchableSetting<u8, true> volume{100, 0, 200, "volume"};
-    Setting<bool> dump_audio_commands{false, "dump_audio_commands"};
+    Setting<std::string> sink_id{linkage, "auto", "output_engine", 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<bool, false, false> audio_muted{linkage, false, "audio_muted", Category::Audio};
+    SwitchableSetting<u8, true> volume{linkage, 100, 0, 200, "volume", Category::Audio};
+    Setting<bool, false, false> dump_audio_commands{linkage, false, "dump_audio_commands",
+                                                    Category::Audio};
 
     // Core
-    SwitchableSetting<bool> use_multi_core{true, "use_multi_core"};
-    SwitchableSetting<bool> use_unsafe_extended_memory_layout{false,
-                                                              "use_unsafe_extended_memory_layout"};
+    SwitchableSetting<bool> use_multi_core{linkage, true, "use_multi_core", Category::Core};
+    SwitchableSetting<bool> use_unsafe_extended_memory_layout{
+        linkage, false, "use_unsafe_extended_memory_layout", Category::Core};
 
     // Cpu
-    SwitchableSetting<CPUAccuracy, true> cpu_accuracy{CPUAccuracy::Auto, CPUAccuracy::Auto,
-                                                      CPUAccuracy::Paranoid, "cpu_accuracy"};
+    SwitchableSetting<CPUAccuracy, true> cpu_accuracy{linkage,           CPUAccuracy::Auto,
+                                                      CPUAccuracy::Auto, CPUAccuracy::Paranoid,
+                                                      "cpu_accuracy",    Category::Cpu};
     // TODO: remove cpu_accuracy_first_time, migration setting added 8 July 2021
-    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"};
-    Setting<bool> cpuopt_ignore_memory_aborts{true, "cpuopt_ignore_memory_aborts"};
-
-    SwitchableSetting<bool> cpuopt_unsafe_unfuse_fma{true, "cpuopt_unsafe_unfuse_fma"};
-    SwitchableSetting<bool> cpuopt_unsafe_reduce_fp_error{true, "cpuopt_unsafe_reduce_fp_error"};
+    Setting<bool> cpu_accuracy_first_time{linkage, true, "cpu_accuracy_first_time", Category::Cpu};
+    Setting<bool> cpu_debug_mode{linkage, false, "cpu_debug_mode", Category::Cpu};
+
+    Setting<bool> cpuopt_page_tables{linkage, true, "cpuopt_page_tables", Category::Cpu};
+    Setting<bool> cpuopt_block_linking{linkage, true, "cpuopt_block_linking", Category::Cpu};
+    Setting<bool> cpuopt_return_stack_buffer{linkage, true, "cpuopt_return_stack_buffer",
+                                             Category::Cpu};
+    Setting<bool> cpuopt_fast_dispatcher{linkage, true, "cpuopt_fast_dispatcher", Category::Cpu};
+    Setting<bool> cpuopt_context_elimination{linkage, true, "cpuopt_context_elimination",
+                                             Category::Cpu};
+    Setting<bool> cpuopt_const_prop{linkage, true, "cpuopt_const_prop", Category::Cpu};
+    Setting<bool> cpuopt_misc_ir{linkage, true, "cpuopt_misc_ir", Category::Cpu};
+    Setting<bool> cpuopt_reduce_misalign_checks{linkage, true, "cpuopt_reduce_misalign_checks",
+                                                Category::Cpu};
+    Setting<bool> cpuopt_fastmem{linkage, true, "cpuopt_fastmem", Category::Cpu};
+    Setting<bool> cpuopt_fastmem_exclusives{linkage, true, "cpuopt_fastmem_exclusives",
+                                            Category::Cpu};
+    Setting<bool> cpuopt_recompile_exclusives{linkage, true, "cpuopt_recompile_exclusives",
+                                              Category::Cpu};
+    Setting<bool> cpuopt_ignore_memory_aborts{linkage, true, "cpuopt_ignore_memory_aborts",
+                                              Category::Cpu};
+
+    SwitchableSetting<bool> cpuopt_unsafe_unfuse_fma{linkage, true, "cpuopt_unsafe_unfuse_fma",
+                                                     Category::Cpu};
+    SwitchableSetting<bool> cpuopt_unsafe_reduce_fp_error{
+        linkage, true, "cpuopt_unsafe_reduce_fp_error", Category::Cpu};
     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"};
+        linkage, true, "cpuopt_unsafe_ignore_standard_fpcr", Category::Cpu};
+    SwitchableSetting<bool> cpuopt_unsafe_inaccurate_nan{
+        linkage, true, "cpuopt_unsafe_inaccurate_nan", Category::Cpu};
+    SwitchableSetting<bool> cpuopt_unsafe_fastmem_check{
+        linkage, true, "cpuopt_unsafe_fastmem_check", Category::Cpu};
     SwitchableSetting<bool> cpuopt_unsafe_ignore_global_monitor{
-        true, "cpuopt_unsafe_ignore_global_monitor"};
+        linkage, true, "cpuopt_unsafe_ignore_global_monitor", Category::Cpu};
 
     // Renderer
     SwitchableSetting<RendererBackend, true> renderer_backend{
-        RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null, "backend"};
-    SwitchableSetting<bool> async_presentation{false, "async_presentation"};
-    SwitchableSetting<bool> renderer_force_max_clock{false, "force_max_clock"};
-    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"};
+        linkage,   RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null,
+        "backend", Category::Renderer};
+    SwitchableSetting<bool> async_presentation{linkage, false, "async_presentation",
+                                               Category::AdvancedGraphics};
+    SwitchableSetting<bool> renderer_force_max_clock{linkage, false, "force_max_clock",
+                                                     Category::AdvancedGraphics};
+    Setting<bool> renderer_debug{linkage, false, "debug", Category::Renderer};
+    Setting<bool> renderer_shader_feedback{linkage, false, "shader_feedback", Category::Renderer};
+    Setting<bool> enable_nsight_aftermath{linkage, false, "nsight_aftermath", Category::Renderer};
+    Setting<bool> disable_shader_loop_safety_checks{
+        linkage, false, "disable_shader_loop_safety_checks", Category::Renderer};
+    SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer};
 
     ResolutionScalingInfo resolution_info{};
-    SwitchableSetting<ResolutionSetup> resolution_setup{ResolutionSetup::Res1X, "resolution_setup"};
-    SwitchableSetting<ScalingFilter> scaling_filter{ScalingFilter::Bilinear, "scaling_filter"};
-    SwitchableSetting<int, true> fsr_sharpening_slider{25, 0, 200, "fsr_sharpening_slider"};
-    SwitchableSetting<AntiAliasing> anti_aliasing{AntiAliasing::None, "anti_aliasing"};
+    SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
+                                                        "resolution_setup", Category::Renderer};
+    SwitchableSetting<ScalingFilter> scaling_filter{linkage, ScalingFilter::Bilinear,
+                                                    "scaling_filter", Category::Renderer};
+    SwitchableSetting<int, true> fsr_sharpening_slider{
+        linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer};
+    SwitchableSetting<AntiAliasing> anti_aliasing{linkage, AntiAliasing::None, "anti_aliasing",
+                                                  Category::Renderer};
     // *nix platforms may have issues with the borderless windowed fullscreen mode.
     // Default to exclusive fullscreen on these platforms for now.
-    SwitchableSetting<FullscreenMode, true> fullscreen_mode{
+    SwitchableSetting<FullscreenMode, true> fullscreen_mode{linkage,
 #ifdef _WIN32
-        FullscreenMode::Borderless,
+                                                            FullscreenMode::Borderless,
 #else
-        FullscreenMode::Exclusive,
+                                                            FullscreenMode::Exclusive,
 #endif
-        FullscreenMode::Borderless, FullscreenMode::Exclusive, "fullscreen_mode"};
-    SwitchableSetting<int, true> aspect_ratio{0, 0, 4, "aspect_ratio"};
-    SwitchableSetting<int, true> max_anisotropy{0, 0, 5, "max_anisotropy"};
-    SwitchableSetting<bool> use_speed_limit{true, "use_speed_limit"};
-    SwitchableSetting<u16, true> speed_limit{100, 0, 9999, "speed_limit"};
-    SwitchableSetting<bool> use_disk_shader_cache{true, "use_disk_shader_cache"};
-    SwitchableSetting<GPUAccuracy, true> 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<AstcDecodeMode, true> accelerate_astc{
-        AstcDecodeMode::CPU, AstcDecodeMode::CPU, AstcDecodeMode::CPUAsynchronous,
-        "accelerate_astc"};
-    Setting<VSyncMode, true> vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate,
-                                        VSyncMode::FIFORelaxed, "use_vsync"};
-    SwitchableSetting<bool> use_reactive_flushing{true, "use_reactive_flushing"};
-    SwitchableSetting<ShaderBackend, true> shader_backend{ShaderBackend::GLSL, 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<bool> use_vulkan_driver_pipeline_cache{true,
-                                                             "use_vulkan_driver_pipeline_cache"};
-    SwitchableSetting<bool> enable_compute_pipelines{false, "enable_compute_pipelines"};
-    SwitchableSetting<AstcRecompression, true> astc_recompression{
-        AstcRecompression::Uncompressed, AstcRecompression::Uncompressed, AstcRecompression::Bc3,
-        "astc_recompression"};
-    SwitchableSetting<bool> use_video_framerate{false, "use_video_framerate"};
-    SwitchableSetting<bool> barrier_feedback_loops{true, "barrier_feedback_loops"};
-
-    SwitchableSetting<u8> bg_red{0, "bg_red"};
-    SwitchableSetting<u8> bg_green{0, "bg_green"};
-    SwitchableSetting<u8> bg_blue{0, "bg_blue"};
+                                                            FullscreenMode::Borderless,
+                                                            FullscreenMode::Exclusive,
+                                                            "fullscreen_mode",
+                                                            Category::Renderer};
+    SwitchableSetting<int, true> aspect_ratio{linkage, 0, 0, 4, "aspect_ratio", Category::Renderer};
+    SwitchableSetting<int, true> max_anisotropy{
+        linkage, 0, 0, 5, "max_anisotropy", Category::AdvancedGraphics};
+    SwitchableSetting<bool, false, false> use_speed_limit{linkage, true, "use_speed_limit",
+                                                          Category::Renderer};
+    SwitchableSetting<u16, true> speed_limit{linkage, 100,           0,
+                                             9999,    "speed_limit", Category::Renderer};
+    SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
+                                                  Category::Renderer};
+    SwitchableSetting<GPUAccuracy, true> gpu_accuracy{
+        linkage,        GPUAccuracy::High,         GPUAccuracy::Normal, GPUAccuracy::Extreme,
+        "gpu_accuracy", Category::AdvancedGraphics};
+    SwitchableSetting<bool> use_asynchronous_gpu_emulation{
+        linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
+    SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::GPU,
+                                                      "nvdec_emulation", Category::Renderer};
+    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};
+    SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
+                                                  Category::Renderer};
+    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",
+                                                     Category::Renderer};
+    SwitchableSetting<bool> use_fast_gpu_time{linkage, true, "use_fast_gpu_time",
+                                              Category::AdvancedGraphics};
+    SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{
+        linkage, true, "use_vulkan_driver_pipeline_cache", Category::AdvancedGraphics};
+    SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
+                                                     Category::AdvancedGraphics};
+    SwitchableSetting<AstcRecompression, true> astc_recompression{linkage,
+                                                                  AstcRecompression::Uncompressed,
+                                                                  AstcRecompression::Uncompressed,
+                                                                  AstcRecompression::Bc3,
+                                                                  "astc_recompression",
+                                                                  Category::AdvancedGraphics};
+    SwitchableSetting<bool> use_video_framerate{linkage, false, "use_video_framerate",
+                                                Category::AdvancedGraphics};
+    SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops",
+                                                   Category::AdvancedGraphics};
+
+    SwitchableSetting<u8> bg_red{linkage, 0, "bg_red", Category::Renderer};
+    SwitchableSetting<u8> bg_green{linkage, 0, "bg_green", Category::Renderer};
+    SwitchableSetting<u8> bg_blue{linkage, 0, "bg_blue", Category::Renderer};
 
     // System
-    SwitchableSetting<bool> rng_seed_enabled{false, "rng_seed_enabled"};
-    SwitchableSetting<u32> rng_seed{0, "rng_seed"};
-    Setting<std::string> device_name{"Yuzu", "device_name"};
+    SwitchableSetting<bool> rng_seed_enabled{linkage, false, "rng_seed_enabled", Category::System};
+    SwitchableSetting<u32> rng_seed{linkage, 0, "rng_seed", Category::System};
+    Setting<std::string> device_name{linkage, "Yuzu", "device_name", Category::System};
     // Measured in seconds since epoch
-    SwitchableSetting<bool> custom_rtc_enabled{false, "custom_rtc_enabled"};
-    SwitchableSetting<s64> custom_rtc{0, "custom_rtc"};
+    Setting<bool> custom_rtc_enabled{linkage, false, "custom_rtc_enabled", Category::System};
+    Setting<s64> custom_rtc{linkage, 0, "custom_rtc", Category::System};
     // Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`
     s64 custom_rtc_differential;
 
-    Setting<s32> current_user{0, "current_user"};
-    SwitchableSetting<s32, true> language_index{1, 0, 17, "language_index"};
-    SwitchableSetting<s32, true> region_index{1, 0, 6, "region_index"};
-    SwitchableSetting<s32, true> time_zone_index{0, 0, 45, "time_zone_index"};
-    SwitchableSetting<s32, true> sound_index{1, 0, 2, "sound_index"};
+    Setting<s32> current_user{linkage, 0, "current_user", Category::System};
+    SwitchableSetting<s32, true> language_index{linkage,         1, 0, 17, "language_index",
+                                                Category::System};
+    SwitchableSetting<s32, true> region_index{linkage, 1, 0, 6, "region_index", Category::System};
+    SwitchableSetting<s32, true> time_zone_index{linkage,         0, 0, 45, "time_zone_index",
+                                                 Category::System};
+    SwitchableSetting<s32, true> sound_index{linkage, 1, 0, 2, "sound_index", Category::System};
+
+    SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System};
 
     // Controls
     InputSetting<std::array<PlayerInput, 10>> players;
 
-    SwitchableSetting<bool> use_docked_mode{true, "use_docked_mode"};
-
-    Setting<bool> enable_raw_input{false, "enable_raw_input"};
-    Setting<bool> controller_navigation{true, "controller_navigation"};
-    Setting<bool> enable_joycon_driver{true, "enable_joycon_driver"};
-    Setting<bool> enable_procon_driver{false, "enable_procon_driver"};
-
-    SwitchableSetting<bool> vibration_enabled{true, "vibration_enabled"};
-    SwitchableSetting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"};
-
-    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"};
-
-    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"};
-
-    Setting<bool> mouse_panning{false, "mouse_panning"};
-    Setting<u8, true> mouse_panning_x_sensitivity{50, 1, 100, "mouse_panning_x_sensitivity"};
-    Setting<u8, true> mouse_panning_y_sensitivity{50, 1, 100, "mouse_panning_y_sensitivity"};
-    Setting<u8, true> mouse_panning_deadzone_counterweight{20, 0, 100,
-                                                           "mouse_panning_deadzone_counterweight"};
-    Setting<u8, true> mouse_panning_decay_strength{18, 0, 100, "mouse_panning_decay_strength"};
-    Setting<u8, true> mouse_panning_min_decay{6, 0, 100, "mouse_panning_min_decay"};
-
-    Setting<bool> mouse_enabled{false, "mouse_enabled"};
-    Setting<bool> emulate_analog_keyboard{false, "emulate_analog_keyboard"};
-    Setting<bool> keyboard_enabled{false, "keyboard_enabled"};
-
-    Setting<bool> debug_pad_enabled{false, "debug_pad_enabled"};
+    Setting<bool, false,
+// Only read/write enable_raw_input on Windows platforms
+#ifdef _WIN32
+            true
+#else
+            false
+#endif
+            >
+        enable_raw_input{linkage, false, "enable_raw_input", Category::Controls};
+    Setting<bool> controller_navigation{linkage, true, "controller_navigation", Category::Controls};
+    Setting<bool> enable_joycon_driver{linkage, true, "enable_joycon_driver", Category::Controls};
+    Setting<bool> enable_procon_driver{linkage, false, "enable_procon_driver", Category::Controls};
+
+    SwitchableSetting<bool> vibration_enabled{linkage, true, "vibration_enabled",
+                                              Category::Controls};
+    SwitchableSetting<bool> enable_accurate_vibrations{linkage, false, "enable_accurate_vibrations",
+                                                       Category::Controls};
+
+    SwitchableSetting<bool> motion_enabled{linkage, true, "motion_enabled", Category::Controls};
+    Setting<std::string> udp_input_servers{linkage, "127.0.0.1:26760", "udp_input_servers",
+                                           Category::Controls};
+    Setting<bool> enable_udp_controller{linkage, false, "enable_udp_controller",
+                                        Category::Controls};
+
+    Setting<bool> pause_tas_on_load{linkage, true, "pause_tas_on_load", Category::Controls};
+    Setting<bool> tas_enable{linkage, false, "tas_enable", Category::Controls};
+    Setting<bool> tas_loop{linkage, false, "tas_loop", Category::Controls};
+
+    Setting<bool, false, false> mouse_panning{linkage, false, "mouse_panning", Category::Controls};
+    Setting<u8, true> mouse_panning_sensitivity{
+        linkage, 50, 1, 100, "mouse_panning_sensitivity", Category::Controls};
+    Setting<bool> mouse_enabled{linkage, false, "mouse_enabled", Category::Controls};
+
+    Setting<u8, true> mouse_panning_x_sensitivity{
+        linkage, 50, 1, 100, "mouse_panning_x_sensitivity", Category::Controls};
+    Setting<u8, true> mouse_panning_y_sensitivity{
+        linkage, 50, 1, 100, "mouse_panning_y_sensitivity", Category::Controls};
+    Setting<u8, true> mouse_panning_deadzone_counterweight{
+        linkage, 20, 0, 100, "mouse_panning_deadzone_counterweight", Category::Controls};
+    Setting<u8, true> mouse_panning_decay_strength{
+        linkage, 18, 0, 100, "mouse_panning_decay_strength", Category::Controls};
+    Setting<u8, true> mouse_panning_min_decay{
+        linkage, 6, 0, 100, "mouse_panning_min_decay", Category::Controls};
+
+    Setting<bool> emulate_analog_keyboard{linkage, false, "emulate_analog_keyboard",
+                                          Category::Controls};
+    Setting<bool> keyboard_enabled{linkage, false, "keyboard_enabled", Category::Controls};
+
+    Setting<bool> debug_pad_enabled{linkage, false, "debug_pad_enabled", Category::Controls};
     ButtonsRaw debug_pad_buttons;
     AnalogsRaw debug_pad_analogs;
 
     TouchscreenInput touchscreen;
 
-    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"};
+    Setting<std::string> touch_device{linkage, "min_x:100,min_y:50,max_x:1800,max_y:850",
+                                      "touch_device", Category::Controls};
+    Setting<int> touch_from_button_map_index{linkage, 0, "touch_from_button_map",
+                                             Category::Controls};
     std::vector<TouchFromButtonMap> touch_from_button_maps;
 
-    Setting<bool> enable_ring_controller{true, "enable_ring_controller"};
+    Setting<bool> enable_ring_controller{linkage, true, "enable_ring_controller",
+                                         Category::Controls};
     RingconRaw ringcon_analogs;
 
-    Setting<bool> enable_ir_sensor{false, "enable_ir_sensor"};
-    Setting<std::string> ir_sensor_device{"auto", "ir_sensor_device"};
+    Setting<bool> enable_ir_sensor{linkage, false, "enable_ir_sensor", Category::Controls};
+    Setting<std::string> ir_sensor_device{linkage, "auto", "ir_sensor_device", Category::Controls};
 
-    Setting<bool> random_amiibo_id{false, "random_amiibo_id"};
+    Setting<bool> random_amiibo_id{linkage, false, "random_amiibo_id", Category::Controls};
 
     // Data Storage
-    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"};
+    Setting<bool> use_virtual_sd{linkage, true, "use_virtual_sd", Category::DataStorage};
+    Setting<bool> gamecard_inserted{linkage, false, "gamecard_inserted", Category::DataStorage};
+    Setting<bool> gamecard_current_game{linkage, false, "gamecard_current_game",
+                                        Category::DataStorage};
+    Setting<std::string> gamecard_path{linkage, std::string(), "gamecard_path",
+                                       Category::DataStorage};
 
     // Debugging
     bool record_frame_times;
-    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> disable_macro_hle{false, "disable_macro_hle"};
-    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"};
-    Setting<bool> create_crash_dumps{false, "create_crash_dumps"};
-    Setting<bool> perform_vulkan_check{true, "perform_vulkan_check"};
+    Setting<bool> use_gdbstub{linkage, false, "use_gdbstub", Category::Debugging};
+    Setting<u16> gdbstub_port{linkage, 6543, "gdbstub_port", Category::Debugging};
+    Setting<std::string> program_args{linkage, std::string(), "program_args", Category::Debugging};
+    Setting<bool> dump_exefs{linkage, false, "dump_exefs", Category::Debugging};
+    Setting<bool> dump_nso{linkage, false, "dump_nso", Category::Debugging};
+    Setting<bool, false, false> dump_shaders{linkage, false, "dump_shaders", Category::Debugging};
+    Setting<bool, false, false> dump_macros{linkage, false, "dump_macros", Category::Debugging};
+    Setting<bool> enable_fs_access_log{linkage, false, "enable_fs_access_log", Category::Debugging};
+    Setting<bool, false, false> reporting_services{linkage, false, "reporting_services",
+                                                   Category::Debugging};
+    Setting<bool> quest_flag{linkage, false, "quest_flag", Category::Debugging};
+    Setting<bool> disable_macro_jit{linkage, false, "disable_macro_jit", Category::Debugging};
+    Setting<bool> disable_macro_hle{linkage, false, "disable_macro_hle", Category::Debugging};
+    Setting<bool, false, false> extended_logging{linkage, false, "extended_logging",
+                                                 Category::Debugging};
+    Setting<bool> use_debug_asserts{linkage, false, "use_debug_asserts", Category::Debugging};
+    Setting<bool, false, false> use_auto_stub{linkage, false, "use_auto_stub", Category::Debugging};
+    Setting<bool> enable_all_controllers{linkage, false, "enable_all_controllers",
+                                         Category::Debugging};
+    Setting<bool> create_crash_dumps{linkage, false, "create_crash_dumps", Category::Debugging};
+    Setting<bool> perform_vulkan_check{linkage, true, "perform_vulkan_check", Category::Debugging};
 
     // Miscellaneous
-    Setting<std::string> log_filter{"*:Info", "log_filter"};
-    Setting<bool> use_dev_keys{false, "use_dev_keys"};
+    Setting<std::string> log_filter{linkage, "*:Info", "log_filter", Category::Miscellaneous};
+    Setting<bool> use_dev_keys{linkage, false, "use_dev_keys", Category::Miscellaneous};
 
     // Network
-    Setting<std::string> network_interface{std::string(), "network_interface"};
+    Setting<std::string> network_interface{linkage, std::string(), "network_interface",
+                                           Category::Network};
 
     // WebService
-    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"};
+    Setting<bool> enable_telemetry{linkage, true, "enable_telemetry", Category::WebService};
+    Setting<std::string> web_api_url{linkage, "https://api.yuzu-emu.org", "web_api_url",
+                                     Category::WebService};
+    Setting<std::string> yuzu_username{linkage, std::string(), "yuzu_username",
+                                       Category::WebService};
+    Setting<std::string> yuzu_token{linkage, std::string(), "yuzu_token", Category::WebService};
 
     // Add-Ons
     std::map<u64, std::vector<std::string>> disabled_addons;
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 786c1222f..f274fe4ea 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
 #include <array>
 #include <QKeySequence>
 #include <QSettings>
@@ -16,8 +17,11 @@
 
 namespace FS = Common::FS;
 
-Config::Config(const std::string& config_name, ConfigType config_type) : type(config_type) {
-    global = config_type == ConfigType::GlobalConfig;
+Config::Config(const std::string& config_name, ConfigType config_type)
+    : type(config_type), global{config_type == ConfigType::GlobalConfig} {
+
+    settings_map = Settings::values.linkage.by_category;
+    settings_map.merge(UISettings::values.linkage.by_category);
 
     Initialize(config_name);
 }
@@ -351,15 +355,9 @@ void Config::ReadPlayerValue(std::size_t player_index) {
             player_motions = default_param;
         }
     }
-
-    if (player_index == 0) {
-        ReadMousePanningValues();
-    }
 }
 
 void Config::ReadDebugValues() {
-    ReadBasicSetting(Settings::values.debug_pad_enabled);
-
     for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
         const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
         auto& debug_pad_buttons = Settings::values.debug_pad_buttons[i];
@@ -393,14 +391,6 @@ void Config::ReadDebugValues() {
     }
 }
 
-void Config::ReadKeyboardValues() {
-    ReadBasicSetting(Settings::values.keyboard_enabled);
-}
-
-void Config::ReadMouseValues() {
-    ReadBasicSetting(Settings::values.mouse_enabled);
-}
-
 void Config::ReadTouchscreenValues() {
     Settings::values.touchscreen.enabled =
         ReadSetting(QStringLiteral("touchscreen_enabled"), true).toBool();
@@ -414,9 +404,6 @@ void Config::ReadTouchscreenValues() {
 }
 
 void Config::ReadHidbusValues() {
-    Settings::values.enable_ring_controller =
-        ReadSetting(QStringLiteral("enable_ring_controller"), true).toBool();
-
     const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
         0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f);
     auto& ringcon_analogs = Settings::values.ringcon_analogs;
@@ -430,20 +417,10 @@ void Config::ReadHidbusValues() {
     }
 }
 
-void Config::ReadIrCameraValues() {
-    ReadBasicSetting(Settings::values.enable_ir_sensor);
-    ReadBasicSetting(Settings::values.ir_sensor_device);
-}
-
 void Config::ReadAudioValues() {
     qt_config->beginGroup(QStringLiteral("Audio"));
 
-    if (global) {
-        ReadBasicSetting(Settings::values.sink_id);
-        ReadBasicSetting(Settings::values.audio_output_device_id);
-        ReadBasicSetting(Settings::values.audio_input_device_id);
-    }
-    ReadGlobalSetting(Settings::values.volume);
+    ReadCategory(Settings::Category::Audio);
 
     qt_config->endGroup();
 }
@@ -451,11 +428,12 @@ void Config::ReadAudioValues() {
 void Config::ReadControlValues() {
     qt_config->beginGroup(QStringLiteral("Controls"));
 
+    ReadCategory(Settings::Category::Controls);
+
     Settings::values.players.SetGlobal(!IsCustomConfig());
     for (std::size_t p = 0; p < Settings::values.players.GetValue().size(); ++p) {
         ReadPlayerValue(p);
     }
-    ReadGlobalSetting(Settings::values.use_docked_mode);
 
     // Disable docked mode if handheld is selected
     const auto controller_type = Settings::values.players.GetValue()[0].controller_type;
@@ -464,50 +442,18 @@ void Config::ReadControlValues() {
         Settings::values.use_docked_mode.SetValue(false);
     }
 
-    ReadGlobalSetting(Settings::values.vibration_enabled);
-    ReadGlobalSetting(Settings::values.enable_accurate_vibrations);
-    ReadGlobalSetting(Settings::values.motion_enabled);
     if (IsCustomConfig()) {
         qt_config->endGroup();
         return;
     }
     ReadDebugValues();
-    ReadKeyboardValues();
-    ReadMouseValues();
     ReadTouchscreenValues();
-    ReadMousePanningValues();
     ReadMotionTouchValues();
     ReadHidbusValues();
-    ReadIrCameraValues();
-
-#ifdef _WIN32
-    ReadBasicSetting(Settings::values.enable_raw_input);
-#else
-    Settings::values.enable_raw_input = false;
-#endif
-    ReadBasicSetting(Settings::values.emulate_analog_keyboard);
-    ReadBasicSetting(Settings::values.enable_joycon_driver);
-    ReadBasicSetting(Settings::values.enable_procon_driver);
-    ReadBasicSetting(Settings::values.random_amiibo_id);
-
-    ReadBasicSetting(Settings::values.tas_enable);
-    ReadBasicSetting(Settings::values.tas_loop);
-    ReadBasicSetting(Settings::values.pause_tas_on_load);
-
-    ReadBasicSetting(Settings::values.controller_navigation);
 
     qt_config->endGroup();
 }
 
-void Config::ReadMousePanningValues() {
-    ReadBasicSetting(Settings::values.mouse_panning);
-    ReadBasicSetting(Settings::values.mouse_panning_x_sensitivity);
-    ReadBasicSetting(Settings::values.mouse_panning_y_sensitivity);
-    ReadBasicSetting(Settings::values.mouse_panning_deadzone_counterweight);
-    ReadBasicSetting(Settings::values.mouse_panning_decay_strength);
-    ReadBasicSetting(Settings::values.mouse_panning_min_decay);
-}
-
 void Config::ReadMotionTouchValues() {
     int num_touch_from_button_maps =
         qt_config->beginReadArray(QStringLiteral("touch_from_button_maps"));
@@ -541,19 +487,14 @@ void Config::ReadMotionTouchValues() {
     }
     qt_config->endArray();
 
-    ReadBasicSetting(Settings::values.touch_device);
-    ReadBasicSetting(Settings::values.touch_from_button_map_index);
     Settings::values.touch_from_button_map_index = std::clamp(
         Settings::values.touch_from_button_map_index.GetValue(), 0, num_touch_from_button_maps - 1);
-    ReadBasicSetting(Settings::values.udp_input_servers);
-    ReadBasicSetting(Settings::values.enable_udp_controller);
 }
 
 void Config::ReadCoreValues() {
     qt_config->beginGroup(QStringLiteral("Core"));
 
-    ReadGlobalSetting(Settings::values.use_multi_core);
-    ReadGlobalSetting(Settings::values.use_unsafe_extended_memory_layout);
+    ReadCategory(Settings::Category::Core);
 
     qt_config->endGroup();
 }
@@ -561,7 +502,6 @@ void Config::ReadCoreValues() {
 void Config::ReadDataStorageValues() {
     qt_config->beginGroup(QStringLiteral("Data Storage"));
 
-    ReadBasicSetting(Settings::values.use_virtual_sd);
     FS::SetYuzuPath(
         FS::YuzuPath::NANDDir,
         qt_config
@@ -597,9 +537,7 @@ void Config::ReadDataStorageValues() {
                         .toString()
                         .toStdString());
 
-    ReadBasicSetting(Settings::values.gamecard_inserted);
-    ReadBasicSetting(Settings::values.gamecard_current_game);
-    ReadBasicSetting(Settings::values.gamecard_path);
+    ReadCategory(Settings::Category::DataStorage);
 
     qt_config->endGroup();
 }
@@ -611,29 +549,16 @@ void Config::ReadDebuggingValues() {
     Settings::values.record_frame_times =
         qt_config->value(QStringLiteral("record_frame_times"), false).toBool();
 
-    ReadBasicSetting(Settings::values.use_gdbstub);
-    ReadBasicSetting(Settings::values.gdbstub_port);
-    ReadBasicSetting(Settings::values.program_args);
-    ReadBasicSetting(Settings::values.dump_exefs);
-    ReadBasicSetting(Settings::values.dump_nso);
-    ReadBasicSetting(Settings::values.enable_fs_access_log);
-    ReadBasicSetting(Settings::values.reporting_services);
-    ReadBasicSetting(Settings::values.quest_flag);
-    ReadBasicSetting(Settings::values.disable_macro_jit);
-    ReadBasicSetting(Settings::values.disable_macro_hle);
-    ReadBasicSetting(Settings::values.extended_logging);
-    ReadBasicSetting(Settings::values.use_debug_asserts);
-    ReadBasicSetting(Settings::values.use_auto_stub);
-    ReadBasicSetting(Settings::values.enable_all_controllers);
-    ReadBasicSetting(Settings::values.create_crash_dumps);
-    ReadBasicSetting(Settings::values.perform_vulkan_check);
+    ReadCategory(Settings::Category::Debugging);
 
     qt_config->endGroup();
 }
 
 void Config::ReadServiceValues() {
     qt_config->beginGroup(QStringLiteral("Services"));
-    ReadBasicSetting(Settings::values.network_interface);
+
+    ReadCategory(Settings::Category::Services);
+
     qt_config->endGroup();
 }
 
@@ -659,8 +584,7 @@ void Config::ReadDisabledAddOnValues() {
 void Config::ReadMiscellaneousValues() {
     qt_config->beginGroup(QStringLiteral("Miscellaneous"));
 
-    ReadBasicSetting(Settings::values.log_filter);
-    ReadBasicSetting(Settings::values.use_dev_keys);
+    ReadCategory(Settings::Category::Miscellaneous);
 
     qt_config->endGroup();
 }
@@ -710,35 +634,11 @@ void Config::ReadPathValues() {
 void Config::ReadCpuValues() {
     qt_config->beginGroup(QStringLiteral("Cpu"));
 
-    ReadBasicSetting(Settings::values.cpu_accuracy_first_time);
+    ReadCategory(Settings::Category::Cpu);
+
     if (Settings::values.cpu_accuracy_first_time) {
         Settings::values.cpu_accuracy.SetValue(Settings::values.cpu_accuracy.GetDefault());
         Settings::values.cpu_accuracy_first_time.SetValue(false);
-    } else {
-        ReadGlobalSetting(Settings::values.cpu_accuracy);
-    }
-
-    ReadGlobalSetting(Settings::values.cpuopt_unsafe_unfuse_fma);
-    ReadGlobalSetting(Settings::values.cpuopt_unsafe_reduce_fp_error);
-    ReadGlobalSetting(Settings::values.cpuopt_unsafe_ignore_standard_fpcr);
-    ReadGlobalSetting(Settings::values.cpuopt_unsafe_inaccurate_nan);
-    ReadGlobalSetting(Settings::values.cpuopt_unsafe_fastmem_check);
-    ReadGlobalSetting(Settings::values.cpuopt_unsafe_ignore_global_monitor);
-
-    if (global) {
-        ReadBasicSetting(Settings::values.cpu_debug_mode);
-        ReadBasicSetting(Settings::values.cpuopt_page_tables);
-        ReadBasicSetting(Settings::values.cpuopt_block_linking);
-        ReadBasicSetting(Settings::values.cpuopt_return_stack_buffer);
-        ReadBasicSetting(Settings::values.cpuopt_fast_dispatcher);
-        ReadBasicSetting(Settings::values.cpuopt_context_elimination);
-        ReadBasicSetting(Settings::values.cpuopt_const_prop);
-        ReadBasicSetting(Settings::values.cpuopt_misc_ir);
-        ReadBasicSetting(Settings::values.cpuopt_reduce_misalign_checks);
-        ReadBasicSetting(Settings::values.cpuopt_fastmem);
-        ReadBasicSetting(Settings::values.cpuopt_fastmem_exclusives);
-        ReadBasicSetting(Settings::values.cpuopt_recompile_exclusives);
-        ReadBasicSetting(Settings::values.cpuopt_ignore_memory_aborts);
     }
 
     qt_config->endGroup();
@@ -747,45 +647,8 @@ void Config::ReadCpuValues() {
 void Config::ReadRendererValues() {
     qt_config->beginGroup(QStringLiteral("Renderer"));
 
-    ReadGlobalSetting(Settings::values.renderer_backend);
-    ReadGlobalSetting(Settings::values.async_presentation);
-    ReadGlobalSetting(Settings::values.renderer_force_max_clock);
-    ReadGlobalSetting(Settings::values.vulkan_device);
-    ReadGlobalSetting(Settings::values.fullscreen_mode);
-    ReadGlobalSetting(Settings::values.aspect_ratio);
-    ReadGlobalSetting(Settings::values.resolution_setup);
-    ReadGlobalSetting(Settings::values.scaling_filter);
-    ReadGlobalSetting(Settings::values.fsr_sharpening_slider);
-    ReadGlobalSetting(Settings::values.anti_aliasing);
-    ReadGlobalSetting(Settings::values.max_anisotropy);
-    ReadGlobalSetting(Settings::values.speed_limit);
-    ReadGlobalSetting(Settings::values.use_disk_shader_cache);
-    ReadGlobalSetting(Settings::values.gpu_accuracy);
-    ReadGlobalSetting(Settings::values.use_asynchronous_gpu_emulation);
-    ReadGlobalSetting(Settings::values.nvdec_emulation);
-    ReadGlobalSetting(Settings::values.accelerate_astc);
-    ReadGlobalSetting(Settings::values.astc_recompression);
-    ReadGlobalSetting(Settings::values.use_reactive_flushing);
-    ReadGlobalSetting(Settings::values.use_asynchronous_shaders);
-    ReadGlobalSetting(Settings::values.use_fast_gpu_time);
-    ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);
-    ReadGlobalSetting(Settings::values.enable_compute_pipelines);
-    ReadGlobalSetting(Settings::values.use_video_framerate);
-    ReadGlobalSetting(Settings::values.barrier_feedback_loops);
-    ReadGlobalSetting(Settings::values.bg_red);
-    ReadGlobalSetting(Settings::values.bg_green);
-    ReadGlobalSetting(Settings::values.bg_blue);
-
-    if (global) {
-        Settings::values.vsync_mode.SetValue(static_cast<Settings::VSyncMode>(
-            ReadSetting(QString::fromStdString(Settings::values.vsync_mode.GetLabel()),
-                        static_cast<u32>(Settings::values.vsync_mode.GetDefault()))
-                .value<u32>()));
-        ReadBasicSetting(Settings::values.renderer_debug);
-        ReadBasicSetting(Settings::values.renderer_shader_feedback);
-        ReadBasicSetting(Settings::values.enable_nsight_aftermath);
-        ReadBasicSetting(Settings::values.disable_shader_loop_safety_checks);
-    }
+    ReadCategory(Settings::Category::Renderer);
+    ReadCategory(Settings::Category::AdvancedGraphics);
 
     qt_config->endGroup();
 }
@@ -832,41 +695,7 @@ void Config::ReadShortcutValues() {
 void Config::ReadSystemValues() {
     qt_config->beginGroup(QStringLiteral("System"));
 
-    ReadGlobalSetting(Settings::values.language_index);
-
-    ReadGlobalSetting(Settings::values.region_index);
-
-    ReadGlobalSetting(Settings::values.time_zone_index);
-
-    bool rng_seed_enabled;
-    ReadSettingGlobal(rng_seed_enabled, QStringLiteral("rng_seed_enabled"), false);
-    bool rng_seed_global =
-        global || qt_config->value(QStringLiteral("rng_seed/use_global"), true).toBool();
-    Settings::values.rng_seed.SetGlobal(rng_seed_global);
-    if (global || !rng_seed_global) {
-        if (rng_seed_enabled) {
-            Settings::values.rng_seed.SetValue(ReadSetting(QStringLiteral("rng_seed"), 0).toUInt());
-        } else {
-            Settings::values.rng_seed.SetValue(std::nullopt);
-        }
-    }
-
-    if (global) {
-        ReadBasicSetting(Settings::values.current_user);
-        Settings::values.current_user = std::clamp<int>(Settings::values.current_user.GetValue(), 0,
-                                                        Service::Account::MAX_USERS - 1);
-
-        const auto custom_rtc_enabled =
-            ReadSetting(QStringLiteral("custom_rtc_enabled"), false).toBool();
-        if (custom_rtc_enabled) {
-            Settings::values.custom_rtc = ReadSetting(QStringLiteral("custom_rtc"), 0).toLongLong();
-        } else {
-            Settings::values.custom_rtc = std::nullopt;
-        }
-        ReadBasicSetting(Settings::values.device_name);
-    }
-
-    ReadGlobalSetting(Settings::values.sound_index);
+    ReadCategory(Settings::Category::System);
 
     qt_config->endGroup();
 }
@@ -879,8 +708,6 @@ void Config::ReadUIValues() {
             QStringLiteral("theme"),
             QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second))
             .toString();
-    ReadBasicSetting(UISettings::values.enable_discord_presence);
-    ReadBasicSetting(UISettings::values.select_user_on_boot);
 
     ReadUIGamelistValues();
     ReadUILayoutValues();
@@ -889,20 +716,7 @@ void Config::ReadUIValues() {
     ReadShortcutValues();
     ReadMultiplayerValues();
 
-    ReadBasicSetting(UISettings::values.single_window_mode);
-    ReadBasicSetting(UISettings::values.fullscreen);
-    ReadBasicSetting(UISettings::values.display_titlebar);
-    ReadBasicSetting(UISettings::values.show_filter_bar);
-    ReadBasicSetting(UISettings::values.show_status_bar);
-    ReadBasicSetting(UISettings::values.confirm_before_closing);
-    ReadBasicSetting(UISettings::values.first_start);
-    ReadBasicSetting(UISettings::values.callout_flags);
-    ReadBasicSetting(UISettings::values.show_console);
-    ReadBasicSetting(UISettings::values.pause_when_in_background);
-    ReadBasicSetting(UISettings::values.mute_when_in_background);
-    ReadBasicSetting(UISettings::values.hide_mouse);
-    ReadBasicSetting(UISettings::values.controller_applet_disabled);
-    ReadBasicSetting(UISettings::values.disable_web_applet);
+    ReadCategory(Settings::Category::Ui);
 
     qt_config->endGroup();
 }
@@ -910,16 +724,8 @@ void Config::ReadUIValues() {
 void Config::ReadUIGamelistValues() {
     qt_config->beginGroup(QStringLiteral("UIGameList"));
 
-    ReadBasicSetting(UISettings::values.show_add_ons);
-    ReadBasicSetting(UISettings::values.show_compat);
-    ReadBasicSetting(UISettings::values.show_size);
-    ReadBasicSetting(UISettings::values.show_types);
-    ReadBasicSetting(UISettings::values.game_icon_size);
-    ReadBasicSetting(UISettings::values.folder_icon_size);
-    ReadBasicSetting(UISettings::values.row_1_text_id);
-    ReadBasicSetting(UISettings::values.row_2_text_id);
-    ReadBasicSetting(UISettings::values.cache_game_list);
-    ReadBasicSetting(UISettings::values.favorites_expanded);
+    ReadCategory(Settings::Category::UiGameList);
+
     const int favorites_size = qt_config->beginReadArray(QStringLiteral("favorites"));
     for (int i = 0; i < favorites_size; i++) {
         qt_config->setArrayIndex(i);
@@ -942,7 +748,8 @@ void Config::ReadUILayoutValues() {
         ReadSetting(QStringLiteral("gameListHeaderState")).toByteArray();
     UISettings::values.microprofile_geometry =
         ReadSetting(QStringLiteral("microProfileDialogGeometry")).toByteArray();
-    ReadBasicSetting(UISettings::values.microprofile_visible);
+
+    ReadCategory(Settings::Category::UiLayout);
 
     qt_config->endGroup();
 }
@@ -950,10 +757,7 @@ void Config::ReadUILayoutValues() {
 void Config::ReadWebServiceValues() {
     qt_config->beginGroup(QStringLiteral("WebService"));
 
-    ReadBasicSetting(Settings::values.enable_telemetry);
-    ReadBasicSetting(Settings::values.web_api_url);
-    ReadBasicSetting(Settings::values.yuzu_username);
-    ReadBasicSetting(Settings::values.yuzu_token);
+    ReadCategory(Settings::Category::WebService);
 
     qt_config->endGroup();
 }
@@ -961,17 +765,7 @@ void Config::ReadWebServiceValues() {
 void Config::ReadMultiplayerValues() {
     qt_config->beginGroup(QStringLiteral("Multiplayer"));
 
-    ReadBasicSetting(UISettings::values.multiplayer_nickname);
-    ReadBasicSetting(UISettings::values.multiplayer_ip);
-    ReadBasicSetting(UISettings::values.multiplayer_port);
-    ReadBasicSetting(UISettings::values.multiplayer_room_nickname);
-    ReadBasicSetting(UISettings::values.multiplayer_room_name);
-    ReadBasicSetting(UISettings::values.multiplayer_room_port);
-    ReadBasicSetting(UISettings::values.multiplayer_host_type);
-    ReadBasicSetting(UISettings::values.multiplayer_port);
-    ReadBasicSetting(UISettings::values.multiplayer_max_player);
-    ReadBasicSetting(UISettings::values.multiplayer_game_id);
-    ReadBasicSetting(UISettings::values.multiplayer_room_description);
+    ReadCategory(Settings::Category::Multiplayer);
 
     // Read ban list back
     int size = qt_config->beginReadArray(QStringLiteral("username_ban_list"));
@@ -1075,14 +869,9 @@ void Config::SavePlayerValue(std::size_t player_index) {
                      QString::fromStdString(player.motions[i]),
                      QString::fromStdString(default_param));
     }
-
-    if (player_index == 0) {
-        SaveMousePanningValues();
-    }
 }
 
 void Config::SaveDebugValues() {
-    WriteBasicSetting(Settings::values.debug_pad_enabled);
     for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
         const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
         WriteSetting(QStringLiteral("debug_pad_") +
@@ -1101,10 +890,6 @@ void Config::SaveDebugValues() {
     }
 }
 
-void Config::SaveMouseValues() {
-    WriteBasicSetting(Settings::values.mouse_enabled);
-}
-
 void Config::SaveTouchscreenValues() {
     const auto& touchscreen = Settings::values.touchscreen;
 
@@ -1115,21 +900,7 @@ void Config::SaveTouchscreenValues() {
     WriteSetting(QStringLiteral("touchscreen_diameter_y"), touchscreen.diameter_y, 15);
 }
 
-void Config::SaveMousePanningValues() {
-    // Don't overwrite values.mouse_panning
-    WriteBasicSetting(Settings::values.mouse_panning_x_sensitivity);
-    WriteBasicSetting(Settings::values.mouse_panning_y_sensitivity);
-    WriteBasicSetting(Settings::values.mouse_panning_deadzone_counterweight);
-    WriteBasicSetting(Settings::values.mouse_panning_decay_strength);
-    WriteBasicSetting(Settings::values.mouse_panning_min_decay);
-}
-
 void Config::SaveMotionTouchValues() {
-    WriteBasicSetting(Settings::values.touch_device);
-    WriteBasicSetting(Settings::values.touch_from_button_map_index);
-    WriteBasicSetting(Settings::values.udp_input_servers);
-    WriteBasicSetting(Settings::values.enable_udp_controller);
-
     qt_config->beginWriteArray(QStringLiteral("touch_from_button_maps"));
     for (std::size_t p = 0; p < Settings::values.touch_from_button_maps.size(); ++p) {
         qt_config->setArrayIndex(static_cast<int>(p));
@@ -1150,8 +921,6 @@ void Config::SaveMotionTouchValues() {
 }
 
 void Config::SaveHidbusValues() {
-    WriteBasicSetting(Settings::values.enable_ring_controller);
-
     const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
         0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f);
     WriteSetting(QStringLiteral("ring_controller"),
@@ -1159,11 +928,6 @@ void Config::SaveHidbusValues() {
                  QString::fromStdString(default_param));
 }
 
-void Config::SaveIrCameraValues() {
-    WriteBasicSetting(Settings::values.enable_ir_sensor);
-    WriteBasicSetting(Settings::values.ir_sensor_device);
-}
-
 void Config::SaveValues() {
     if (global) {
         SaveDataStorageValues();
@@ -1180,18 +944,14 @@ void Config::SaveValues() {
     SaveRendererValues();
     SaveAudioValues();
     SaveSystemValues();
+
     qt_config->sync();
 }
 
 void Config::SaveAudioValues() {
     qt_config->beginGroup(QStringLiteral("Audio"));
 
-    if (global) {
-        WriteBasicSetting(Settings::values.sink_id);
-        WriteBasicSetting(Settings::values.audio_output_device_id);
-        WriteBasicSetting(Settings::values.audio_input_device_id);
-    }
-    WriteGlobalSetting(Settings::values.volume);
+    WriteCategory(Settings::Category::Audio);
 
     qt_config->endGroup();
 }
@@ -1199,6 +959,8 @@ void Config::SaveAudioValues() {
 void Config::SaveControlValues() {
     qt_config->beginGroup(QStringLiteral("Controls"));
 
+    WriteCategory(Settings::Category::Controls);
+
     Settings::values.players.SetGlobal(!IsCustomConfig());
     for (std::size_t p = 0; p < Settings::values.players.GetValue().size(); ++p) {
         SavePlayerValue(p);
@@ -1208,28 +970,9 @@ void Config::SaveControlValues() {
         return;
     }
     SaveDebugValues();
-    SaveMouseValues();
     SaveTouchscreenValues();
-    SaveMousePanningValues();
     SaveMotionTouchValues();
     SaveHidbusValues();
-    SaveIrCameraValues();
-
-    WriteGlobalSetting(Settings::values.use_docked_mode);
-    WriteGlobalSetting(Settings::values.vibration_enabled);
-    WriteGlobalSetting(Settings::values.enable_accurate_vibrations);
-    WriteGlobalSetting(Settings::values.motion_enabled);
-    WriteBasicSetting(Settings::values.enable_raw_input);
-    WriteBasicSetting(Settings::values.enable_joycon_driver);
-    WriteBasicSetting(Settings::values.enable_procon_driver);
-    WriteBasicSetting(Settings::values.random_amiibo_id);
-    WriteBasicSetting(Settings::values.keyboard_enabled);
-    WriteBasicSetting(Settings::values.emulate_analog_keyboard);
-    WriteBasicSetting(Settings::values.controller_navigation);
-
-    WriteBasicSetting(Settings::values.tas_enable);
-    WriteBasicSetting(Settings::values.tas_loop);
-    WriteBasicSetting(Settings::values.pause_tas_on_load);
 
     qt_config->endGroup();
 }
@@ -1237,8 +980,7 @@ void Config::SaveControlValues() {
 void Config::SaveCoreValues() {
     qt_config->beginGroup(QStringLiteral("Core"));
 
-    WriteGlobalSetting(Settings::values.use_multi_core);
-    WriteGlobalSetting(Settings::values.use_unsafe_extended_memory_layout);
+    WriteCategory(Settings::Category::Core);
 
     qt_config->endGroup();
 }
@@ -1246,7 +988,6 @@ void Config::SaveCoreValues() {
 void Config::SaveDataStorageValues() {
     qt_config->beginGroup(QStringLiteral("Data Storage"));
 
-    WriteBasicSetting(Settings::values.use_virtual_sd);
     WriteSetting(QStringLiteral("nand_directory"),
                  QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::NANDDir)),
                  QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::NANDDir)));
@@ -1263,9 +1004,7 @@ void Config::SaveDataStorageValues() {
                  QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASDir)),
                  QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASDir)));
 
-    WriteBasicSetting(Settings::values.gamecard_inserted);
-    WriteBasicSetting(Settings::values.gamecard_current_game);
-    WriteBasicSetting(Settings::values.gamecard_path);
+    WriteCategory(Settings::Category::DataStorage);
 
     qt_config->endGroup();
 }
@@ -1275,19 +1014,8 @@ void Config::SaveDebuggingValues() {
 
     // Intentionally not using the QT default setting as this is intended to be changed in the ini
     qt_config->setValue(QStringLiteral("record_frame_times"), Settings::values.record_frame_times);
-    WriteBasicSetting(Settings::values.use_gdbstub);
-    WriteBasicSetting(Settings::values.gdbstub_port);
-    WriteBasicSetting(Settings::values.program_args);
-    WriteBasicSetting(Settings::values.dump_exefs);
-    WriteBasicSetting(Settings::values.dump_nso);
-    WriteBasicSetting(Settings::values.enable_fs_access_log);
-    WriteBasicSetting(Settings::values.quest_flag);
-    WriteBasicSetting(Settings::values.use_debug_asserts);
-    WriteBasicSetting(Settings::values.disable_macro_jit);
-    WriteBasicSetting(Settings::values.disable_macro_hle);
-    WriteBasicSetting(Settings::values.enable_all_controllers);
-    WriteBasicSetting(Settings::values.create_crash_dumps);
-    WriteBasicSetting(Settings::values.perform_vulkan_check);
+
+    WriteCategory(Settings::Category::Debugging);
 
     qt_config->endGroup();
 }
@@ -1295,7 +1023,7 @@ void Config::SaveDebuggingValues() {
 void Config::SaveNetworkValues() {
     qt_config->beginGroup(QStringLiteral("Services"));
 
-    WriteBasicSetting(Settings::values.network_interface);
+    WriteCategory(Settings::Category::Network);
 
     qt_config->endGroup();
 }
@@ -1322,8 +1050,7 @@ void Config::SaveDisabledAddOnValues() {
 void Config::SaveMiscellaneousValues() {
     qt_config->beginGroup(QStringLiteral("Miscellaneous"));
 
-    WriteBasicSetting(Settings::values.log_filter);
-    WriteBasicSetting(Settings::values.use_dev_keys);
+    WriteCategory(Settings::Category::Miscellaneous);
 
     qt_config->endGroup();
 }
@@ -1351,34 +1078,7 @@ void Config::SavePathValues() {
 void Config::SaveCpuValues() {
     qt_config->beginGroup(QStringLiteral("Cpu"));
 
-    WriteBasicSetting(Settings::values.cpu_accuracy_first_time);
-    WriteSetting(QStringLiteral("cpu_accuracy"),
-                 static_cast<u32>(Settings::values.cpu_accuracy.GetValue(global)),
-                 static_cast<u32>(Settings::values.cpu_accuracy.GetDefault()),
-                 Settings::values.cpu_accuracy.UsingGlobal());
-
-    WriteGlobalSetting(Settings::values.cpuopt_unsafe_unfuse_fma);
-    WriteGlobalSetting(Settings::values.cpuopt_unsafe_reduce_fp_error);
-    WriteGlobalSetting(Settings::values.cpuopt_unsafe_ignore_standard_fpcr);
-    WriteGlobalSetting(Settings::values.cpuopt_unsafe_inaccurate_nan);
-    WriteGlobalSetting(Settings::values.cpuopt_unsafe_fastmem_check);
-    WriteGlobalSetting(Settings::values.cpuopt_unsafe_ignore_global_monitor);
-
-    if (global) {
-        WriteBasicSetting(Settings::values.cpu_debug_mode);
-        WriteBasicSetting(Settings::values.cpuopt_page_tables);
-        WriteBasicSetting(Settings::values.cpuopt_block_linking);
-        WriteBasicSetting(Settings::values.cpuopt_return_stack_buffer);
-        WriteBasicSetting(Settings::values.cpuopt_fast_dispatcher);
-        WriteBasicSetting(Settings::values.cpuopt_context_elimination);
-        WriteBasicSetting(Settings::values.cpuopt_const_prop);
-        WriteBasicSetting(Settings::values.cpuopt_misc_ir);
-        WriteBasicSetting(Settings::values.cpuopt_reduce_misalign_checks);
-        WriteBasicSetting(Settings::values.cpuopt_fastmem);
-        WriteBasicSetting(Settings::values.cpuopt_fastmem_exclusives);
-        WriteBasicSetting(Settings::values.cpuopt_recompile_exclusives);
-        WriteBasicSetting(Settings::values.cpuopt_ignore_memory_aborts);
-    }
+    WriteCategory(Settings::Category::Cpu);
 
     qt_config->endGroup();
 }
@@ -1386,82 +1086,8 @@ void Config::SaveCpuValues() {
 void Config::SaveRendererValues() {
     qt_config->beginGroup(QStringLiteral("Renderer"));
 
-    WriteSetting(QString::fromStdString(Settings::values.renderer_backend.GetLabel()),
-                 static_cast<u32>(Settings::values.renderer_backend.GetValue(global)),
-                 static_cast<u32>(Settings::values.renderer_backend.GetDefault()),
-                 Settings::values.renderer_backend.UsingGlobal());
-    WriteGlobalSetting(Settings::values.async_presentation);
-    WriteGlobalSetting(Settings::values.renderer_force_max_clock);
-    WriteGlobalSetting(Settings::values.vulkan_device);
-    WriteSetting(QString::fromStdString(Settings::values.fullscreen_mode.GetLabel()),
-                 static_cast<u32>(Settings::values.fullscreen_mode.GetValue(global)),
-                 static_cast<u32>(Settings::values.fullscreen_mode.GetDefault()),
-                 Settings::values.fullscreen_mode.UsingGlobal());
-    WriteGlobalSetting(Settings::values.aspect_ratio);
-    WriteSetting(QString::fromStdString(Settings::values.resolution_setup.GetLabel()),
-                 static_cast<u32>(Settings::values.resolution_setup.GetValue(global)),
-                 static_cast<u32>(Settings::values.resolution_setup.GetDefault()),
-                 Settings::values.resolution_setup.UsingGlobal());
-    WriteSetting(QString::fromStdString(Settings::values.scaling_filter.GetLabel()),
-                 static_cast<u32>(Settings::values.scaling_filter.GetValue(global)),
-                 static_cast<u32>(Settings::values.scaling_filter.GetDefault()),
-                 Settings::values.scaling_filter.UsingGlobal());
-    WriteSetting(QString::fromStdString(Settings::values.fsr_sharpening_slider.GetLabel()),
-                 static_cast<u32>(Settings::values.fsr_sharpening_slider.GetValue(global)),
-                 static_cast<u32>(Settings::values.fsr_sharpening_slider.GetDefault()),
-                 Settings::values.fsr_sharpening_slider.UsingGlobal());
-    WriteSetting(QString::fromStdString(Settings::values.anti_aliasing.GetLabel()),
-                 static_cast<u32>(Settings::values.anti_aliasing.GetValue(global)),
-                 static_cast<u32>(Settings::values.anti_aliasing.GetDefault()),
-                 Settings::values.anti_aliasing.UsingGlobal());
-    WriteGlobalSetting(Settings::values.max_anisotropy);
-    WriteGlobalSetting(Settings::values.speed_limit);
-    WriteGlobalSetting(Settings::values.use_disk_shader_cache);
-    WriteSetting(QString::fromStdString(Settings::values.gpu_accuracy.GetLabel()),
-                 static_cast<u32>(Settings::values.gpu_accuracy.GetValue(global)),
-                 static_cast<u32>(Settings::values.gpu_accuracy.GetDefault()),
-                 Settings::values.gpu_accuracy.UsingGlobal());
-    WriteGlobalSetting(Settings::values.use_asynchronous_gpu_emulation);
-    WriteSetting(QString::fromStdString(Settings::values.nvdec_emulation.GetLabel()),
-                 static_cast<u32>(Settings::values.nvdec_emulation.GetValue(global)),
-                 static_cast<u32>(Settings::values.nvdec_emulation.GetDefault()),
-                 Settings::values.nvdec_emulation.UsingGlobal());
-    WriteSetting(QString::fromStdString(Settings::values.accelerate_astc.GetLabel()),
-                 static_cast<u32>(Settings::values.accelerate_astc.GetValue(global)),
-                 static_cast<u32>(Settings::values.accelerate_astc.GetDefault()),
-                 Settings::values.accelerate_astc.UsingGlobal());
-    WriteSetting(QString::fromStdString(Settings::values.astc_recompression.GetLabel()),
-                 static_cast<u32>(Settings::values.astc_recompression.GetValue(global)),
-                 static_cast<u32>(Settings::values.astc_recompression.GetDefault()),
-                 Settings::values.astc_recompression.UsingGlobal());
-    WriteGlobalSetting(Settings::values.use_reactive_flushing);
-    WriteSetting(QString::fromStdString(Settings::values.accelerate_astc.GetLabel()),
-                 static_cast<u32>(Settings::values.accelerate_astc.GetValue(global)),
-                 static_cast<u32>(Settings::values.accelerate_astc.GetDefault()),
-                 Settings::values.shader_backend.UsingGlobal());
-    WriteSetting(QString::fromStdString(Settings::values.shader_backend.GetLabel()),
-                 static_cast<u32>(Settings::values.shader_backend.GetValue(global)),
-                 static_cast<u32>(Settings::values.shader_backend.GetDefault()),
-                 Settings::values.shader_backend.UsingGlobal());
-    WriteGlobalSetting(Settings::values.use_asynchronous_shaders);
-    WriteGlobalSetting(Settings::values.use_fast_gpu_time);
-    WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);
-    WriteGlobalSetting(Settings::values.enable_compute_pipelines);
-    WriteGlobalSetting(Settings::values.use_video_framerate);
-    WriteGlobalSetting(Settings::values.barrier_feedback_loops);
-    WriteGlobalSetting(Settings::values.bg_red);
-    WriteGlobalSetting(Settings::values.bg_green);
-    WriteGlobalSetting(Settings::values.bg_blue);
-
-    if (global) {
-        WriteSetting(QString::fromStdString(Settings::values.vsync_mode.GetLabel()),
-                     static_cast<u32>(Settings::values.vsync_mode.GetValue()),
-                     static_cast<u32>(Settings::values.vsync_mode.GetDefault()));
-        WriteBasicSetting(Settings::values.renderer_debug);
-        WriteBasicSetting(Settings::values.renderer_shader_feedback);
-        WriteBasicSetting(Settings::values.enable_nsight_aftermath);
-        WriteBasicSetting(Settings::values.disable_shader_loop_safety_checks);
-    }
+    WriteCategory(Settings::Category::AdvancedGraphics);
+    WriteCategory(Settings::Category::Renderer);
 
     qt_config->endGroup();
 }
@@ -1469,9 +1095,9 @@ void Config::SaveRendererValues() {
 void Config::SaveScreenshotValues() {
     qt_config->beginGroup(QStringLiteral("Screenshots"));
 
-    WriteBasicSetting(UISettings::values.enable_screenshot_save_as);
     WriteSetting(QStringLiteral("screenshot_path"),
                  QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::ScreenshotsDir)));
+    WriteCategory(Settings::Category::Screenshots);
 
     qt_config->endGroup();
 }
@@ -1502,27 +1128,7 @@ void Config::SaveShortcutValues() {
 void Config::SaveSystemValues() {
     qt_config->beginGroup(QStringLiteral("System"));
 
-    WriteGlobalSetting(Settings::values.language_index);
-    WriteGlobalSetting(Settings::values.region_index);
-    WriteGlobalSetting(Settings::values.time_zone_index);
-
-    WriteSetting(QStringLiteral("rng_seed_enabled"),
-                 Settings::values.rng_seed.GetValue(global).has_value(), false,
-                 Settings::values.rng_seed.UsingGlobal());
-    WriteSetting(QStringLiteral("rng_seed"), Settings::values.rng_seed.GetValue(global).value_or(0),
-                 0, Settings::values.rng_seed.UsingGlobal());
-
-    if (global) {
-        WriteBasicSetting(Settings::values.current_user);
-
-        WriteSetting(QStringLiteral("custom_rtc_enabled"), Settings::values.custom_rtc.has_value(),
-                     false);
-        WriteSetting(QStringLiteral("custom_rtc"),
-                     QVariant::fromValue<long long>(Settings::values.custom_rtc.value_or(0)), 0);
-        WriteBasicSetting(Settings::values.device_name);
-    }
-
-    WriteGlobalSetting(Settings::values.sound_index);
+    WriteCategory(Settings::Category::System);
 
     qt_config->endGroup();
 }
@@ -1530,10 +1136,10 @@ void Config::SaveSystemValues() {
 void Config::SaveUIValues() {
     qt_config->beginGroup(QStringLiteral("UI"));
 
+    WriteCategory(Settings::Category::Ui);
+
     WriteSetting(QStringLiteral("theme"), UISettings::values.theme,
                  QString::fromUtf8(UISettings::themes[static_cast<size_t>(default_theme)].second));
-    WriteBasicSetting(UISettings::values.enable_discord_presence);
-    WriteBasicSetting(UISettings::values.select_user_on_boot);
 
     SaveUIGamelistValues();
     SaveUILayoutValues();
@@ -1542,37 +1148,14 @@ void Config::SaveUIValues() {
     SaveShortcutValues();
     SaveMultiplayerValues();
 
-    WriteBasicSetting(UISettings::values.single_window_mode);
-    WriteBasicSetting(UISettings::values.fullscreen);
-    WriteBasicSetting(UISettings::values.display_titlebar);
-    WriteBasicSetting(UISettings::values.show_filter_bar);
-    WriteBasicSetting(UISettings::values.show_status_bar);
-    WriteBasicSetting(UISettings::values.confirm_before_closing);
-    WriteBasicSetting(UISettings::values.first_start);
-    WriteBasicSetting(UISettings::values.callout_flags);
-    WriteBasicSetting(UISettings::values.show_console);
-    WriteBasicSetting(UISettings::values.pause_when_in_background);
-    WriteBasicSetting(UISettings::values.mute_when_in_background);
-    WriteBasicSetting(UISettings::values.hide_mouse);
-    WriteBasicSetting(UISettings::values.controller_applet_disabled);
-    WriteBasicSetting(UISettings::values.disable_web_applet);
-
     qt_config->endGroup();
 }
 
 void Config::SaveUIGamelistValues() {
     qt_config->beginGroup(QStringLiteral("UIGameList"));
 
-    WriteBasicSetting(UISettings::values.show_add_ons);
-    WriteBasicSetting(UISettings::values.show_compat);
-    WriteBasicSetting(UISettings::values.show_size);
-    WriteBasicSetting(UISettings::values.show_types);
-    WriteBasicSetting(UISettings::values.game_icon_size);
-    WriteBasicSetting(UISettings::values.folder_icon_size);
-    WriteBasicSetting(UISettings::values.row_1_text_id);
-    WriteBasicSetting(UISettings::values.row_2_text_id);
-    WriteBasicSetting(UISettings::values.cache_game_list);
-    WriteBasicSetting(UISettings::values.favorites_expanded);
+    WriteCategory(Settings::Category::UiGameList);
+
     qt_config->beginWriteArray(QStringLiteral("favorites"));
     for (int i = 0; i < UISettings::values.favorited_ids.size(); i++) {
         qt_config->setArrayIndex(i);
@@ -1593,7 +1176,8 @@ void Config::SaveUILayoutValues() {
     WriteSetting(QStringLiteral("gameListHeaderState"), UISettings::values.gamelist_header_state);
     WriteSetting(QStringLiteral("microProfileDialogGeometry"),
                  UISettings::values.microprofile_geometry);
-    WriteBasicSetting(UISettings::values.microprofile_visible);
+
+    WriteCategory(Settings::Category::UiLayout);
 
     qt_config->endGroup();
 }
@@ -1601,10 +1185,7 @@ void Config::SaveUILayoutValues() {
 void Config::SaveWebServiceValues() {
     qt_config->beginGroup(QStringLiteral("WebService"));
 
-    WriteBasicSetting(Settings::values.enable_telemetry);
-    WriteBasicSetting(Settings::values.web_api_url);
-    WriteBasicSetting(Settings::values.yuzu_username);
-    WriteBasicSetting(Settings::values.yuzu_token);
+    WriteCategory(Settings::Category::WebService);
 
     qt_config->endGroup();
 }
@@ -1612,17 +1193,7 @@ void Config::SaveWebServiceValues() {
 void Config::SaveMultiplayerValues() {
     qt_config->beginGroup(QStringLiteral("Multiplayer"));
 
-    WriteBasicSetting(UISettings::values.multiplayer_nickname);
-    WriteBasicSetting(UISettings::values.multiplayer_ip);
-    WriteBasicSetting(UISettings::values.multiplayer_port);
-    WriteBasicSetting(UISettings::values.multiplayer_room_nickname);
-    WriteBasicSetting(UISettings::values.multiplayer_room_name);
-    WriteBasicSetting(UISettings::values.multiplayer_room_port);
-    WriteBasicSetting(UISettings::values.multiplayer_host_type);
-    WriteBasicSetting(UISettings::values.multiplayer_port);
-    WriteBasicSetting(UISettings::values.multiplayer_max_player);
-    WriteBasicSetting(UISettings::values.multiplayer_game_id);
-    WriteBasicSetting(UISettings::values.multiplayer_room_description);
+    WriteCategory(Settings::Category::Multiplayer);
 
     // Write ban list
     qt_config->beginWriteArray(QStringLiteral("username_ban_list"));
@@ -1731,3 +1302,58 @@ void Config::ClearControlPlayerValues() {
 const std::string& Config::GetConfigFilePath() const {
     return qt_config_loc;
 }
+
+void Config::ReadCategory(Settings::Category category) {
+    const auto& settings = settings_map[category];
+    std::for_each(settings.begin(), settings.end(),
+                  [&](const auto& setting) { ReadSettingGeneric(setting); });
+}
+
+void Config::WriteCategory(Settings::Category category) {
+    const auto& settings = settings_map[category];
+    std::for_each(settings.begin(), settings.end(),
+                  [&](const auto& setting) { WriteSettingGeneric(setting); });
+}
+
+void Config::ReadSettingGeneric(Settings::BasicSetting* const setting) {
+    if (!setting->Save()) {
+        return;
+    }
+    const QString name = QString::fromStdString(setting->GetLabel());
+    const auto default_value =
+        QVariant::fromValue<QString>(QString::fromStdString(setting->DefaultToString()));
+
+    if (setting->Switchable()) {
+        const bool use_global =
+            qt_config->value(name + QStringLiteral("/use_global"), true).value<bool>();
+        setting->SetGlobal(use_global);
+
+        if (global || !use_global) {
+            setting->LoadString(ReadSetting(name, default_value).value<QString>().toStdString());
+        }
+    } else if (global) {
+        setting->LoadString(ReadSetting(name, default_value).value<QString>().toStdString());
+    }
+}
+
+void Config::WriteSettingGeneric(Settings::BasicSetting* const setting) const {
+    if (!setting->Save()) {
+        return;
+    }
+    const QVariant value = QVariant::fromValue(QString::fromStdString(setting->ToString()));
+    const QVariant default_value =
+        QVariant::fromValue(QString::fromStdString(setting->DefaultToString()));
+    const QString label = QString::fromStdString(setting->GetLabel());
+    if (setting->Switchable()) {
+        if (!global) {
+            qt_config->setValue(label + QStringLiteral("/use_global"), setting->UsingGlobal());
+        }
+        if (global || !setting->UsingGlobal()) {
+            qt_config->setValue(label + QStringLiteral("/default"), value == default_value);
+            qt_config->setValue(label, value);
+        }
+    } else if (global) {
+        qt_config->setValue(label + QStringLiteral("/default"), value == default_value);
+        qt_config->setValue(label, value);
+    }
+}
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index e066f7552..ec748bf0c 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -74,7 +74,6 @@ private:
     void ReadKeyboardValues();
     void ReadMouseValues();
     void ReadTouchscreenValues();
-    void ReadMousePanningValues();
     void ReadMotionTouchValues();
     void ReadHidbusValues();
     void ReadIrCameraValues();
@@ -105,7 +104,6 @@ private:
     void SaveDebugValues();
     void SaveMouseValues();
     void SaveTouchscreenValues();
-    void SaveMousePanningValues();
     void SaveMotionTouchValues();
     void SaveHidbusValues();
     void SaveIrCameraValues();
@@ -201,10 +199,17 @@ private:
     template <typename Type, bool ranged>
     void WriteBasicSetting(const Settings::Setting<Type, ranged>& setting);
 
-    ConfigType type;
+    void ReadCategory(Settings::Category category);
+    void WriteCategory(Settings::Category category);
+    void ReadSettingGeneric(Settings::BasicSetting* const setting);
+    void WriteSettingGeneric(Settings::BasicSetting* const setting) const;
+
+    std::map<Settings::Category, std::forward_list<Settings::BasicSetting*>> settings_map;
+
+    const ConfigType type;
     std::unique_ptr<QSettings> qt_config;
     std::string qt_config_loc;
-    bool global;
+    const bool global;
 };
 
 // These metatype declarations cannot be in common/settings.h because core is devoid of QT
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index ac42cc7fc..8fd12c9e8 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -43,25 +43,6 @@ void ConfigurationShared::SetHighlight(QWidget* widget, bool highlighted) {
     widget->show();
 }
 
-void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox,
-                                             const Settings::SwitchableSetting<bool>& setting,
-                                             CheckState& tracker) {
-    if (setting.UsingGlobal()) {
-        tracker = CheckState::Global;
-    } else {
-        tracker = (setting.GetValue() == setting.GetValue(true)) ? CheckState::On : CheckState::Off;
-    }
-    SetHighlight(checkbox, tracker != CheckState::Global);
-    QObject::connect(checkbox, &QCheckBox::clicked, checkbox, [checkbox, setting, &tracker] {
-        tracker = static_cast<CheckState>((static_cast<int>(tracker) + 1) %
-                                          static_cast<int>(CheckState::Count));
-        if (tracker == CheckState::Global) {
-            checkbox->setChecked(setting.GetValue(true));
-        }
-        SetHighlight(checkbox, tracker != CheckState::Global);
-    });
-}
-
 void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, bool global, bool state,
                                              bool global_state, CheckState& tracker) {
     if (global) {
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 04c88758c..1e61bcbeb 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -57,8 +57,26 @@ void SetPerGameSetting(QComboBox* combobox,
 void SetHighlight(QWidget* widget, bool highlighted);
 
 // Sets up a QCheckBox like a tristate one, given a Setting
-void SetColoredTristate(QCheckBox* checkbox, const Settings::SwitchableSetting<bool>& setting,
-                        CheckState& tracker);
+template <bool ranged, bool save>
+void SetColoredTristate(QCheckBox* checkbox,
+                        const Settings::SwitchableSetting<bool, ranged, save>& setting,
+                        CheckState& tracker) {
+    if (setting.UsingGlobal()) {
+        tracker = CheckState::Global;
+    } else {
+        tracker = (setting.GetValue() == setting.GetValue(true)) ? CheckState::On : CheckState::Off;
+    }
+    SetHighlight(checkbox, tracker != CheckState::Global);
+    QObject::connect(checkbox, &QCheckBox::clicked, checkbox, [checkbox, setting, &tracker] {
+        tracker = static_cast<CheckState>((static_cast<int>(tracker) + 1) %
+                                          static_cast<int>(CheckState::Count));
+        if (tracker == CheckState::Global) {
+            checkbox->setChecked(setting.GetValue(true));
+        }
+        SetHighlight(checkbox, tracker != CheckState::Global);
+    });
+}
+
 void SetColoredTristate(QCheckBox* checkbox, bool global, bool state, bool global_state,
                         CheckState& tracker);
 
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 0be8ee369..53cdd7fcb 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -14,6 +14,7 @@
 #include "common/common_types.h"
 #include "common/settings.h"
 
+using Settings::Category;
 using Settings::Setting;
 
 namespace UISettings {
@@ -58,6 +59,8 @@ struct GameDir {
 };
 
 struct Values {
+    Settings::Linkage linkage{};
+
     QByteArray geometry;
     QByteArray state;
 
@@ -66,33 +69,36 @@ struct Values {
     QByteArray gamelist_header_state;
 
     QByteArray microprofile_geometry;
-    Setting<bool> microprofile_visible{false, "microProfileDialogVisible"};
-
-    Setting<bool> single_window_mode{true, "singleWindowMode"};
-    Setting<bool> fullscreen{false, "fullscreen"};
-    Setting<bool> display_titlebar{true, "displayTitleBars"};
-    Setting<bool> show_filter_bar{true, "showFilterBar"};
-    Setting<bool> show_status_bar{true, "showStatusBar"};
-
-    Setting<bool> confirm_before_closing{true, "confirmClose"};
-    Setting<bool> first_start{true, "firstStart"};
-    Setting<bool> pause_when_in_background{false, "pauseWhenInBackground"};
-    Setting<bool> mute_when_in_background{false, "muteWhenInBackground"};
-    Setting<bool> hide_mouse{true, "hideInactiveMouse"};
-    Setting<bool> controller_applet_disabled{false, "disableControllerApplet"};
+    Setting<bool> microprofile_visible{linkage, false, "microProfileDialogVisible",
+                                       Category::UiLayout};
+
+    Setting<bool> single_window_mode{linkage, true, "singleWindowMode", Category::Ui};
+    Setting<bool> fullscreen{linkage, false, "fullscreen", Category::Ui};
+    Setting<bool> display_titlebar{linkage, true, "displayTitleBars", Category::Ui};
+    Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};
+    Setting<bool> show_status_bar{linkage, true, "showStatusBar", Category::Ui};
+
+    Setting<bool> confirm_before_closing{linkage, true, "confirmClose", Category::Ui};
+    Setting<bool> first_start{linkage, true, "firstStart", Category::Ui};
+    Setting<bool> pause_when_in_background{linkage, false, "pauseWhenInBackground", Category::Ui};
+    Setting<bool> mute_when_in_background{linkage, false, "muteWhenInBackground", Category::Ui};
+    Setting<bool> hide_mouse{linkage, true, "hideInactiveMouse", Category::Ui};
+    Setting<bool> controller_applet_disabled{linkage, false, "disableControllerApplet",
+                                             Category::Ui};
     // Set when Vulkan is known to crash the application
     bool has_broken_vulkan = false;
 
-    Setting<bool> select_user_on_boot{false, "select_user_on_boot"};
-    Setting<bool> disable_web_applet{true, "disable_web_applet"};
+    Setting<bool> select_user_on_boot{linkage, false, "select_user_on_boot", Category::Ui};
+    Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Ui};
 
     // Discord RPC
-    Setting<bool> enable_discord_presence{true, "enable_discord_presence"};
+    Setting<bool> enable_discord_presence{linkage, true, "enable_discord_presence", Category::Ui};
 
     // logging
-    Setting<bool> show_console{false, "showConsole"};
+    Setting<bool> show_console{linkage, false, "showConsole", Category::Ui};
 
-    Setting<bool> enable_screenshot_save_as{true, "enable_screenshot_save_as"};
+    Setting<bool> enable_screenshot_save_as{linkage, true, "enable_screenshot_save_as",
+                                            Category::Screenshots};
 
     QString roms_path;
     QString symbols_path;
@@ -107,38 +113,42 @@ struct Values {
     // Shortcut name <Shortcut, context>
     std::vector<Shortcut> shortcuts;
 
-    Setting<u32> callout_flags{0, "calloutFlags"};
+    Setting<u32> callout_flags{linkage, 0, "calloutFlags", Category::Ui};
 
     // multiplayer settings
-    Setting<std::string> multiplayer_nickname{{}, "nickname"};
-    Setting<std::string> multiplayer_ip{{}, "ip"};
-    Setting<u16, true> multiplayer_port{24872, 0, UINT16_MAX, "port"};
-    Setting<std::string> multiplayer_room_nickname{{}, "room_nickname"};
-    Setting<std::string> multiplayer_room_name{{}, "room_name"};
-    Setting<u8, true> multiplayer_max_player{8, 0, 8, "max_player"};
-    Setting<u16, true> multiplayer_room_port{24872, 0, UINT16_MAX, "room_port"};
-    Setting<u8, true> multiplayer_host_type{0, 0, 1, "host_type"};
-    Setting<unsigned long long> multiplayer_game_id{{}, "game_id"};
-    Setting<std::string> multiplayer_room_description{{}, "room_description"};
+    Setting<std::string> multiplayer_nickname{linkage, {}, "nickname", Category::Multiplayer};
+    Setting<std::string> multiplayer_ip{linkage, {}, "ip", Category::Multiplayer};
+    Setting<u16, true> multiplayer_port{linkage,    24872,  0,
+                                        UINT16_MAX, "port", Category::Multiplayer};
+    Setting<std::string> multiplayer_room_nickname{
+        linkage, {}, "room_nickname", Category::Multiplayer};
+    Setting<std::string> multiplayer_room_name{linkage, {}, "room_name", Category::Multiplayer};
+    Setting<u8, true> multiplayer_max_player{linkage, 8, 0, 8, "max_player", Category::Multiplayer};
+    Setting<u16, true> multiplayer_room_port{linkage,    24872,       0,
+                                             UINT16_MAX, "room_port", Category::Multiplayer};
+    Setting<u8, true> multiplayer_host_type{linkage, 0, 0, 1, "host_type", Category::Multiplayer};
+    Setting<unsigned long long> multiplayer_game_id{linkage, {}, "game_id", Category::Multiplayer};
+    Setting<std::string> multiplayer_room_description{
+        linkage, {}, "room_description", Category::Multiplayer};
     std::pair<std::vector<std::string>, std::vector<std::string>> multiplayer_ban_list;
 
     // Game List
-    Setting<bool> show_add_ons{true, "show_add_ons"};
-    Setting<u32> game_icon_size{64, "game_icon_size"};
-    Setting<u32> folder_icon_size{48, "folder_icon_size"};
-    Setting<u8> row_1_text_id{3, "row_1_text_id"};
-    Setting<u8> row_2_text_id{2, "row_2_text_id"};
+    Setting<bool> show_add_ons{linkage, true, "show_add_ons", Category::UiGameList};
+    Setting<u32> game_icon_size{linkage, 64, "game_icon_size", Category::UiGameList};
+    Setting<u32> folder_icon_size{linkage, 48, "folder_icon_size", Category::UiGameList};
+    Setting<u8> row_1_text_id{linkage, 3, "row_1_text_id", Category::UiGameList};
+    Setting<u8> row_2_text_id{linkage, 2, "row_2_text_id", Category::UiGameList};
     std::atomic_bool is_game_list_reload_pending{false};
-    Setting<bool> cache_game_list{true, "cache_game_list"};
-    Setting<bool> favorites_expanded{true, "favorites_expanded"};
+    Setting<bool> cache_game_list{linkage, true, "cache_game_list", Category::UiGameList};
+    Setting<bool> favorites_expanded{linkage, true, "favorites_expanded", Category::UiGameList};
     QVector<u64> favorited_ids;
 
     // Compatibility List
-    Setting<bool> show_compat{false, "show_compat"};
+    Setting<bool> show_compat{linkage, false, "show_compat", Category::UiGameList};
 
     // Size & File Types Column
-    Setting<bool> show_size{true, "show_size"};
-    Setting<bool> show_types{true, "show_types"};
+    Setting<bool> show_size{linkage, true, "show_size", Category::UiGameList};
+    Setting<bool> show_types{linkage, true, "show_types", Category::UiGameList};
 
     bool configuration_applied;
     bool reset_to_defaults;
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index b2049ae57..cfc1a5d81 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -98,8 +98,26 @@ void Config::ReadSetting(const std::string& group, Settings::Setting<Type, range
                                                         static_cast<long>(setting.GetDefault())));
 }
 
+void Config::ReadCategory(Settings::Category category) {
+    for (const auto setting : Settings::values.linkage.by_category[category]) {
+        const char* category_name = [&]() {
+            if (category == Settings::Category::Controls) {
+                // For compatibility with older configs
+                return "ControlsGeneral";
+            } else {
+                return Settings::TranslateCategory(category);
+            }
+        }();
+        std::string setting_value =
+            sdl2_config->Get(category_name, setting->GetLabel(), setting->DefaultToString());
+        setting->LoadString(setting_value);
+    }
+}
+
 void Config::ReadValues() {
     // Controls
+    ReadCategory(Settings::Category::Controls);
+
     for (std::size_t p = 0; p < Settings::values.players.GetValue().size(); ++p) {
         auto& player = Settings::values.players.GetValue()[p];
 
@@ -139,13 +157,6 @@ void Config::ReadValues() {
         player.connected = sdl2_config->GetBoolean(group, "connected", false);
     }
 
-    ReadSetting("ControlsGeneral", Settings::values.mouse_enabled);
-
-    ReadSetting("ControlsGeneral", Settings::values.touch_device);
-
-    ReadSetting("ControlsGeneral", Settings::values.keyboard_enabled);
-
-    ReadSetting("ControlsGeneral", Settings::values.debug_pad_enabled);
     for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
         std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
         Settings::values.debug_pad_buttons[i] = sdl2_config->Get(
@@ -166,14 +177,6 @@ void Config::ReadValues() {
             Settings::values.debug_pad_analogs[i] = default_param;
     }
 
-    ReadSetting("ControlsGeneral", Settings::values.enable_raw_input);
-    ReadSetting("ControlsGeneral", Settings::values.enable_joycon_driver);
-    ReadSetting("ControlsGeneral", Settings::values.enable_procon_driver);
-    ReadSetting("ControlsGeneral", Settings::values.random_amiibo_id);
-    ReadSetting("ControlsGeneral", Settings::values.emulate_analog_keyboard);
-    ReadSetting("ControlsGeneral", Settings::values.vibration_enabled);
-    ReadSetting("ControlsGeneral", Settings::values.enable_accurate_vibrations);
-    ReadSetting("ControlsGeneral", Settings::values.motion_enabled);
     Settings::values.touchscreen.enabled =
         sdl2_config->GetBoolean("ControlsGeneral", "touch_enabled", true);
     Settings::values.touchscreen.rotation_angle =
@@ -217,10 +220,19 @@ void Config::ReadValues() {
     Settings::values.touch_from_button_map_index = std::clamp(
         Settings::values.touch_from_button_map_index.GetValue(), 0, num_touch_from_button_maps - 1);
 
-    ReadSetting("ControlsGeneral", Settings::values.udp_input_servers);
+    ReadCategory(Settings::Category::Audio);
+    ReadCategory(Settings::Category::Core);
+    ReadCategory(Settings::Category::Cpu);
+    ReadCategory(Settings::Category::Renderer);
+    ReadCategory(Settings::Category::AdvancedGraphics);
+    ReadCategory(Settings::Category::System);
+    ReadCategory(Settings::Category::DataStorage);
+    ReadCategory(Settings::Category::Debugging);
+    ReadCategory(Settings::Category::Miscellaneous);
+    ReadCategory(Settings::Category::Network);
+    ReadCategory(Settings::Category::WebService);
 
     // Data Storage
-    ReadSetting("Data Storage", Settings::values.use_virtual_sd);
     FS::SetYuzuPath(FS::YuzuPath::NANDDir,
                     sdl2_config->Get("Data Storage", "nand_directory",
                                      FS::GetYuzuPathString(FS::YuzuPath::NANDDir)));
@@ -233,122 +245,10 @@ void Config::ReadValues() {
     FS::SetYuzuPath(FS::YuzuPath::DumpDir,
                     sdl2_config->Get("Data Storage", "dump_directory",
                                      FS::GetYuzuPathString(FS::YuzuPath::DumpDir)));
-    ReadSetting("Data Storage", Settings::values.gamecard_inserted);
-    ReadSetting("Data Storage", Settings::values.gamecard_current_game);
-    ReadSetting("Data Storage", Settings::values.gamecard_path);
-
-    // System
-    ReadSetting("System", Settings::values.use_docked_mode);
-
-    ReadSetting("System", Settings::values.current_user);
-    Settings::values.current_user = std::clamp<int>(Settings::values.current_user.GetValue(), 0,
-                                                    Service::Account::MAX_USERS - 1);
-
-    const auto rng_seed_enabled = sdl2_config->GetBoolean("System", "rng_seed_enabled", false);
-    if (rng_seed_enabled) {
-        Settings::values.rng_seed.SetValue(sdl2_config->GetInteger("System", "rng_seed", 0));
-    } else {
-        Settings::values.rng_seed.SetValue(std::nullopt);
-    }
-
-    const auto custom_rtc_enabled = sdl2_config->GetBoolean("System", "custom_rtc_enabled", false);
-    if (custom_rtc_enabled) {
-        Settings::values.custom_rtc = sdl2_config->GetInteger("System", "custom_rtc", 0);
-    } else {
-        Settings::values.custom_rtc = std::nullopt;
-    }
-
-    ReadSetting("System", Settings::values.language_index);
-    ReadSetting("System", Settings::values.region_index);
-    ReadSetting("System", Settings::values.time_zone_index);
-    ReadSetting("System", Settings::values.sound_index);
-
-    // Core
-    ReadSetting("Core", Settings::values.use_multi_core);
-    ReadSetting("Core", Settings::values.use_unsafe_extended_memory_layout);
-
-    // Cpu
-    ReadSetting("Cpu", Settings::values.cpu_accuracy);
-    ReadSetting("Cpu", Settings::values.cpu_debug_mode);
-    ReadSetting("Cpu", Settings::values.cpuopt_page_tables);
-    ReadSetting("Cpu", Settings::values.cpuopt_block_linking);
-    ReadSetting("Cpu", Settings::values.cpuopt_return_stack_buffer);
-    ReadSetting("Cpu", Settings::values.cpuopt_fast_dispatcher);
-    ReadSetting("Cpu", Settings::values.cpuopt_context_elimination);
-    ReadSetting("Cpu", Settings::values.cpuopt_const_prop);
-    ReadSetting("Cpu", Settings::values.cpuopt_misc_ir);
-    ReadSetting("Cpu", Settings::values.cpuopt_reduce_misalign_checks);
-    ReadSetting("Cpu", Settings::values.cpuopt_fastmem);
-    ReadSetting("Cpu", Settings::values.cpuopt_fastmem_exclusives);
-    ReadSetting("Cpu", Settings::values.cpuopt_recompile_exclusives);
-    ReadSetting("Cpu", Settings::values.cpuopt_ignore_memory_aborts);
-    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_unfuse_fma);
-    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_reduce_fp_error);
-    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_ignore_standard_fpcr);
-    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_inaccurate_nan);
-    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_fastmem_check);
-    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_ignore_global_monitor);
-
-    // Renderer
-    ReadSetting("Renderer", Settings::values.renderer_backend);
-    ReadSetting("Renderer", Settings::values.async_presentation);
-    ReadSetting("Renderer", Settings::values.renderer_force_max_clock);
-    ReadSetting("Renderer", Settings::values.renderer_debug);
-    ReadSetting("Renderer", Settings::values.renderer_shader_feedback);
-    ReadSetting("Renderer", Settings::values.enable_nsight_aftermath);
-    ReadSetting("Renderer", Settings::values.disable_shader_loop_safety_checks);
-    ReadSetting("Renderer", Settings::values.vulkan_device);
-
-    ReadSetting("Renderer", Settings::values.resolution_setup);
-    ReadSetting("Renderer", Settings::values.scaling_filter);
-    ReadSetting("Renderer", Settings::values.fsr_sharpening_slider);
-    ReadSetting("Renderer", Settings::values.anti_aliasing);
-    ReadSetting("Renderer", Settings::values.fullscreen_mode);
-    ReadSetting("Renderer", Settings::values.aspect_ratio);
-    ReadSetting("Renderer", Settings::values.max_anisotropy);
-    ReadSetting("Renderer", Settings::values.use_speed_limit);
-    ReadSetting("Renderer", Settings::values.speed_limit);
-    ReadSetting("Renderer", Settings::values.use_disk_shader_cache);
-    ReadSetting("Renderer", Settings::values.gpu_accuracy);
-    ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation);
-    ReadSetting("Renderer", Settings::values.vsync_mode);
-    ReadSetting("Renderer", Settings::values.shader_backend);
-    ReadSetting("Renderer", Settings::values.use_reactive_flushing);
-    ReadSetting("Renderer", Settings::values.use_asynchronous_shaders);
-    ReadSetting("Renderer", Settings::values.nvdec_emulation);
-    ReadSetting("Renderer", Settings::values.accelerate_astc);
-    ReadSetting("Renderer", Settings::values.astc_recompression);
-    ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);
-
-    ReadSetting("Renderer", Settings::values.bg_red);
-    ReadSetting("Renderer", Settings::values.bg_green);
-    ReadSetting("Renderer", Settings::values.bg_blue);
-
-    // Audio
-    ReadSetting("Audio", Settings::values.sink_id);
-    ReadSetting("Audio", Settings::values.audio_output_device_id);
-    ReadSetting("Audio", Settings::values.volume);
-
-    // Miscellaneous
-    // log_filter has a different default here than from common
-    Settings::values.log_filter =
-        sdl2_config->Get("Miscellaneous", Settings::values.log_filter.GetLabel(), "*:Trace");
-    ReadSetting("Miscellaneous", Settings::values.use_dev_keys);
 
     // Debugging
     Settings::values.record_frame_times =
         sdl2_config->GetBoolean("Debugging", "record_frame_times", false);
-    ReadSetting("Debugging", Settings::values.dump_exefs);
-    ReadSetting("Debugging", Settings::values.dump_nso);
-    ReadSetting("Debugging", Settings::values.enable_fs_access_log);
-    ReadSetting("Debugging", Settings::values.reporting_services);
-    ReadSetting("Debugging", Settings::values.quest_flag);
-    ReadSetting("Debugging", Settings::values.use_debug_asserts);
-    ReadSetting("Debugging", Settings::values.use_auto_stub);
-    ReadSetting("Debugging", Settings::values.disable_macro_jit);
-    ReadSetting("Debugging", Settings::values.disable_macro_hle);
-    ReadSetting("Debugging", Settings::values.use_gdbstub);
-    ReadSetting("Debugging", Settings::values.gdbstub_port);
 
     const auto title_list = sdl2_config->Get("AddOns", "title_ids", "");
     std::stringstream ss(title_list);
@@ -366,15 +266,6 @@ void Config::ReadValues() {
 
         Settings::values.disabled_addons.insert_or_assign(title_id, out);
     }
-
-    // Web Service
-    ReadSetting("WebService", Settings::values.enable_telemetry);
-    ReadSetting("WebService", Settings::values.web_api_url);
-    ReadSetting("WebService", Settings::values.yuzu_username);
-    ReadSetting("WebService", Settings::values.yuzu_token);
-
-    // Network
-    ReadSetting("Network", Settings::values.network_interface);
 }
 
 void Config::Reload() {
diff --git a/src/yuzu_cmd/config.h b/src/yuzu_cmd/config.h
index 021438b17..512591a39 100644
--- a/src/yuzu_cmd/config.h
+++ b/src/yuzu_cmd/config.h
@@ -34,4 +34,5 @@ private:
      */
     template <typename Type, bool ranged>
     void ReadSetting(const std::string& group, Settings::Setting<Type, ranged>& setting);
+    void ReadCategory(Settings::Category category);
 };
-- 
cgit v1.2.3


From a007ac6b9ccc23861f5a5c6967d535220ed794b0 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 7 May 2023 09:48:26 -0400
Subject: configure_graphics_advance: Generate UI at runtime

We can iterate through the AdvancedGraphics settings and generate the UI
during runtime. This doesn't help runtime efficiency, but it helps a ton
in reducing the amount of work a developer needs in order to add a new
setting.
---
 src/common/settings.h                              |  53 +++--
 src/core/telemetry_session.cpp                     |   2 +
 src/video_core/textures/texture.cpp                |   4 +-
 src/yuzu/CMakeLists.txt                            |   2 +
 src/yuzu/configuration/configuration_shared.cpp    | 153 ++++++++++++++
 src/yuzu/configuration/configuration_shared.h      |   6 +
 src/yuzu/configuration/configure_dialog.cpp        |   8 +-
 src/yuzu/configuration/configure_dialog.h          |   1 +
 .../configuration/configure_graphics_advanced.cpp  | 172 ++++-----------
 .../configuration/configure_graphics_advanced.h    |  20 +-
 .../configuration/configure_graphics_advanced.ui   | 234 +--------------------
 src/yuzu/configuration/configure_per_game.cpp      |   9 +-
 src/yuzu/configuration/configure_per_game.h        |   1 +
 src/yuzu/configuration/shared_translation.cpp      | 170 +++++++++++++++
 src/yuzu/configuration/shared_translation.h        |  18 ++
 15 files changed, 451 insertions(+), 402 deletions(-)
 create mode 100644 src/yuzu/configuration/shared_translation.cpp
 create mode 100644 src/yuzu/configuration/shared_translation.h

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index df4bcb053..48f86d0aa 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -20,6 +20,15 @@
 
 namespace Settings {
 
+enum class AnisotropyMode : u32 {
+    Automatic = 0,
+    Default = 1,
+    X2 = 2,
+    X4 = 3,
+    X8 = 4,
+    X16 = 5,
+};
+
 enum class AstcDecodeMode : u32 {
     CPU = 0,
     GPU = 1,
@@ -49,6 +58,7 @@ enum class GPUAccuracy : u32 {
     Normal = 0,
     High = 1,
     Extreme = 2,
+    MaxEnum = 3,
 };
 
 enum class CPUAccuracy : u32 {
@@ -166,11 +176,16 @@ public:
     virtual Category Category() const = 0;
     virtual constexpr bool Switchable() const = 0;
     virtual std::string ToString() const = 0;
+    virtual std::string ToStringGlobal() const {
+        return {};
+    }
     virtual void LoadString(const std::string& load) = 0;
     virtual const std::string& GetLabel() const = 0;
     virtual std::string DefaultToString() const = 0;
     virtual bool Save() const = 0;
     virtual std::type_index TypeId() const = 0;
+    virtual bool IsEnum() const = 0;
+    virtual bool RuntimeModfiable() const = 0;
     virtual void SetGlobal(bool global) {}
     virtual bool UsingGlobal() const {
         return false;
@@ -188,7 +203,7 @@ public:
  * configurations. Specifying a default value and label is required. A minimum and maximum range
  * can be specified for sanitization.
  */
-template <typename Type, bool ranged = false, bool save = true>
+template <typename Type, bool ranged = false, bool save = true, bool runtime_modifiable = false>
 class Setting : public BasicSetting {
 protected:
     Setting() = default;
@@ -282,6 +297,14 @@ public:
         return category;
     }
 
+    [[nodiscard]] bool RuntimeModfiable() const override {
+        return runtime_modifiable;
+    }
+
+    [[nodiscard]] bool IsEnum() const override {
+        return std::is_enum<Type>::value;
+    }
+
     /**
      * Returns whether the current setting is Switchable.
      *
@@ -291,7 +314,7 @@ public:
         return false;
     }
 
-private:
+protected:
     std::string ToString(const Type& value_) const {
         if constexpr (std::is_same<Type, std::string>()) {
             return value_;
@@ -408,8 +431,8 @@ protected:
  *
  * By default, the global setting is used.
  */
-template <typename Type, bool ranged = false, bool save = true>
-class SwitchableSetting : virtual public Setting<Type, ranged, save> {
+template <typename Type, bool ranged = false, bool save = true, bool runtime_modifiable = false>
+class SwitchableSetting : virtual public Setting<Type, ranged, save, runtime_modifiable> {
 public:
     /**
      * Sets a default value, label, and setting value.
@@ -422,7 +445,7 @@ public:
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
                                Category category)
         requires(!ranged)
-        : Setting<Type, false, save>{linkage, default_val, name, category} {
+        : Setting<Type, false, save, runtime_modifiable>{linkage, default_val, name, category} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
     virtual ~SwitchableSetting() = default;
@@ -440,7 +463,8 @@ public:
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
                                const Type& max_val, const std::string& name, Category category)
         requires(ranged)
-        : Setting<Type, true, save>{linkage, default_val, min_val, max_val, name, category} {
+        : Setting<Type, true, save, runtime_modifiable>{linkage, default_val, min_val,
+                                                        max_val, name,        category} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
 
@@ -502,6 +526,10 @@ public:
         return true;
     }
 
+    [[nodiscard]] virtual std::string ToStringGlobal() const override {
+        return this->ToString(this->value);
+    }
+
     /**
      * Assigns the current setting value depending on the global state.
      *
@@ -667,15 +695,16 @@ struct Values {
                                                             "fullscreen_mode",
                                                             Category::Renderer};
     SwitchableSetting<int, true> aspect_ratio{linkage, 0, 0, 4, "aspect_ratio", Category::Renderer};
-    SwitchableSetting<int, true> max_anisotropy{
-        linkage, 0, 0, 5, "max_anisotropy", Category::AdvancedGraphics};
+    SwitchableSetting<AnisotropyMode, true> max_anisotropy{
+        linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
+        "max_anisotropy", Category::AdvancedGraphics};
     SwitchableSetting<bool, false, false> use_speed_limit{linkage, true, "use_speed_limit",
                                                           Category::Renderer};
     SwitchableSetting<u16, true> speed_limit{linkage, 100,           0,
                                              9999,    "speed_limit", Category::Renderer};
     SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
                                                   Category::Renderer};
-    SwitchableSetting<GPUAccuracy, true> gpu_accuracy{
+    SwitchableSetting<GPUAccuracy, true, true, true> gpu_accuracy{
         linkage,        GPUAccuracy::High,         GPUAccuracy::Normal, GPUAccuracy::Extreme,
         "gpu_accuracy", Category::AdvancedGraphics};
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{
@@ -698,9 +727,9 @@ struct Values {
         "shader_backend", Category::Renderer};
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::Renderer};
-    SwitchableSetting<bool> use_fast_gpu_time{linkage, true, "use_fast_gpu_time",
-                                              Category::AdvancedGraphics};
-    SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{
+    SwitchableSetting<bool, false, true, true> use_fast_gpu_time{linkage, true, "use_fast_gpu_time",
+                                                                 Category::AdvancedGraphics};
+    SwitchableSetting<bool, false, true, true> use_vulkan_driver_pipeline_cache{
         linkage, true, "use_vulkan_driver_pipeline_cache", Category::AdvancedGraphics};
     SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
                                                      Category::AdvancedGraphics};
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 665ffe3a2..a3505a505 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -69,6 +69,8 @@ static const char* TranslateGPUAccuracyLevel(Settings::GPUAccuracy backend) {
         return "High";
     case Settings::GPUAccuracy::Extreme:
         return "Extreme";
+    case Settings::GPUAccuracy::MaxEnum:
+        break;
     }
     return "Unknown";
 }
diff --git a/src/video_core/textures/texture.cpp b/src/video_core/textures/texture.cpp
index d8b88d9bc..39c08b5ae 100644
--- a/src/video_core/textures/texture.cpp
+++ b/src/video_core/textures/texture.cpp
@@ -72,12 +72,12 @@ float TSCEntry::MaxAnisotropy() const noexcept {
     }
     const auto anisotropic_settings = Settings::values.max_anisotropy.GetValue();
     s32 added_anisotropic{};
-    if (anisotropic_settings == 0) {
+    if (anisotropic_settings == Settings::AnisotropyMode::Automatic) {
         added_anisotropic = Settings::values.resolution_info.up_scale >>
                             Settings::values.resolution_info.down_shift;
         added_anisotropic = std::max(added_anisotropic - 1, 0);
     } else {
-        added_anisotropic = Settings::values.max_anisotropy.GetValue() - 1U;
+        added_anisotropic = static_cast<u32>(Settings::values.max_anisotropy.GetValue()) - 1U;
     }
     return static_cast<float>(1U << (max_anisotropy + added_anisotropic));
 }
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index fe98e3605..8b54e1268 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -143,6 +143,8 @@ add_executable(yuzu
     configuration/configure_web.ui
     configuration/input_profiles.cpp
     configuration/input_profiles.h
+    configuration/shared_translation.cpp
+    configuration/shared_translation.h
     debugger/console.cpp
     debugger/console.h
     debugger/controller.cpp
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 72b7957e0..44222718c 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -3,14 +3,167 @@
 
 #include <memory>
 #include <QCheckBox>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QObject>
 #include <QString>
 #include <QWidget>
+#include <qnamespace.h>
 #include "common/settings.h"
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_per_game.h"
+#include "yuzu/configuration/shared_translation.h"
 
 namespace ConfigurationShared {
+static std::pair<QWidget*, std::function<void()>> CreateCheckBox(Settings::BasicSetting* setting,
+                                                                 const QString& label,
+                                                                 QWidget* parent,
+                                                                 std::list<CheckState>& trackers) {
+    QCheckBox* checkbox = new QCheckBox(label, parent);
+    checkbox->setObjectName(QString::fromStdString(setting->GetLabel()));
+    checkbox->setCheckState(setting->ToString() == "true" ? Qt::CheckState::Checked
+                                                          : Qt::CheckState::Unchecked);
+
+    CheckState* tracker{};
+
+    // Per-game config highlight
+    if (setting->Switchable() && !Settings::IsConfiguringGlobal()) {
+        bool global_state = setting->ToStringGlobal() == "true";
+        bool state = setting->ToString() == "true";
+        bool global = setting->UsingGlobal();
+        tracker = &trackers.emplace_front(CheckState{});
+        SetColoredTristate(checkbox, global, state, global_state, *tracker);
+    }
+
+    auto load_func = [checkbox, setting, tracker]() {
+        if (Settings::IsConfiguringGlobal()) {
+            setting->LoadString(checkbox->checkState() == Qt::Checked ? "true" : "false");
+        }
+
+        if (Settings::IsConfiguringGlobal() || !setting->Switchable()) {
+            return;
+        }
+
+        if (*tracker != CheckState::Global) {
+            setting->SetGlobal(false);
+            setting->LoadString(checkbox->checkState() == Qt::Checked ? "true" : "false");
+        } else {
+            setting->SetGlobal(true);
+        }
+    };
+
+    return {checkbox, load_func};
+}
+
+static std::pair<QWidget*, std::function<void()>> CreateCombobox(Settings::BasicSetting* setting,
+                                                                 const QString& label,
+                                                                 QWidget* parent) {
+    const auto type = setting->TypeId();
+
+    QWidget* group = new QWidget(parent);
+    group->setObjectName(QString::fromStdString(setting->GetLabel()));
+    QLayout* combobox_layout = new QHBoxLayout(group);
+
+    QLabel* qt_label = new QLabel(label, parent);
+    QComboBox* combobox = new QComboBox(parent);
+
+    std::forward_list<QString> combobox_enumerations = ComboboxEnumeration(type, parent);
+    for (const auto& item : combobox_enumerations) {
+        combobox->addItem(item);
+    }
+
+    combobox_layout->addWidget(qt_label);
+    combobox_layout->addWidget(combobox);
+
+    combobox_layout->setSpacing(6);
+    combobox_layout->setContentsMargins(0, 0, 0, 0);
+
+    if (setting->Switchable() && !Settings::IsConfiguringGlobal()) {
+        int current = std::stoi(setting->ToString());
+        int global_value = std::stoi(setting->ToStringGlobal());
+        SetColoredComboBox(combobox, group, global_value);
+        if (setting->UsingGlobal()) {
+            combobox->setCurrentIndex(USE_GLOBAL_INDEX);
+        } else {
+            SetHighlight(group, true);
+            combobox->setCurrentIndex(current + USE_GLOBAL_OFFSET);
+        }
+    } else {
+        combobox->setCurrentIndex(std::stoi(setting->ToString()));
+    }
+
+    const auto load_func = [combobox, setting]() {
+        if (Settings::IsConfiguringGlobal()) {
+            setting->LoadString(std::to_string(combobox->currentIndex()));
+        }
+
+        if (Settings::IsConfiguringGlobal() || !setting->Switchable()) {
+            return;
+        }
+
+        bool using_global = combobox->currentIndex() == USE_GLOBAL_INDEX;
+        int index = combobox->currentIndex() - USE_GLOBAL_OFFSET;
+
+        setting->SetGlobal(using_global);
+        if (!using_global) {
+            setting->LoadString(std::to_string(index));
+        }
+    };
+
+    return {group, load_func};
+}
+
+QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& translations,
+                      QWidget* parent, bool runtime_lock,
+                      std::forward_list<std::function<void(bool)>>& apply_funcs,
+                      std::list<CheckState>& trackers) {
+    const auto type = setting->TypeId();
+    QWidget* widget{nullptr};
+
+    std::function<void()> load_func;
+
+    const auto [label, tooltip] = [&]() {
+        const auto& setting_label = setting->GetLabel();
+        if (translations.contains(setting_label)) {
+            return std::pair{translations.at(setting_label).first,
+                             translations.at(setting_label).second};
+        }
+        LOG_ERROR(Frontend, "Translation map lacks entry for \"{}\"", setting_label);
+        return std::pair{QString::fromStdString(setting_label), QStringLiteral("")};
+    }();
+
+    if (type == typeid(bool)) {
+        auto pair = CreateCheckBox(setting, label, parent, trackers);
+        widget = pair.first;
+        load_func = pair.second;
+    } else if (setting->IsEnum()) {
+        auto pair = CreateCombobox(setting, label, parent);
+        widget = pair.first;
+        load_func = pair.second;
+    }
+
+    if (widget == nullptr) {
+        LOG_ERROR(Frontend, "No widget was created for \"{}\"", setting->GetLabel());
+        return widget;
+    }
+
+    apply_funcs.push_front([load_func, setting](bool powered_on) {
+        if (setting->RuntimeModfiable() || !powered_on) {
+            load_func();
+        }
+    });
+
+    bool enable = runtime_lock || setting->RuntimeModfiable();
+    enable &=
+        setting->Switchable() && !(Settings::IsConfiguringGlobal() && !setting->UsingGlobal());
+
+    widget->setEnabled(enable);
+    widget->setVisible(Settings::IsConfiguringGlobal() || setting->Switchable());
+
+    widget->setToolTip(tooltip);
+
+    return widget;
+}
 
 Tab::Tab(std::shared_ptr<std::forward_list<Tab*>> group_, QWidget* parent)
     : QWidget(parent), group{group_} {
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 1a3a2a985..7040673ea 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -11,6 +11,7 @@
 #include <QWidget>
 #include <qobjectdefs.h>
 #include "common/settings.h"
+#include "yuzu/configuration/shared_translation.h"
 
 namespace ConfigurationShared {
 
@@ -40,6 +41,11 @@ enum class CheckState {
     Count,  // Simply the number of states, not a valid checkbox state
 };
 
+QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& translations,
+                      QWidget* parent, bool runtime_lock,
+                      std::forward_list<std::function<void(bool)>>& apply_funcs,
+                      std::list<CheckState>& trackers);
+
 // Global-aware apply and set functions
 
 // ApplyPerGameSetting, given a Settings::Setting and a Qt UI element, properly applies a Setting
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index 2cc9f3621..b3f4764c7 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -32,13 +32,15 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
                                  std::vector<VkDeviceInfo::Record>& vk_device_records,
                                  Core::System& system_, bool enable_web_config)
     : QDialog(parent), ui{std::make_unique<Ui::ConfigureDialog>()},
-      registry(registry_), system{system_}, audio_tab{std::make_unique<ConfigureAudio>(
-                                                system_, nullptr, this)},
+      registry(registry_), system{system_},
+      translations{ConfigurationShared::InitializeTranslations(this)},
+      audio_tab{std::make_unique<ConfigureAudio>(system_, nullptr, this)},
       cpu_tab{std::make_unique<ConfigureCpu>(system_, nullptr, this)},
       debug_tab_tab{std::make_unique<ConfigureDebugTab>(system_, this)},
       filesystem_tab{std::make_unique<ConfigureFilesystem>(this)},
       general_tab{std::make_unique<ConfigureGeneral>(system_, nullptr, this)},
-      graphics_advanced_tab{std::make_unique<ConfigureGraphicsAdvanced>(system_, nullptr, this)},
+      graphics_advanced_tab{
+          std::make_unique<ConfigureGraphicsAdvanced>(system_, nullptr, *translations, this)},
       graphics_tab{std::make_unique<ConfigureGraphics>(
           system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
           nullptr, this)},
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index 8ee89a192..0416b01d9 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -71,6 +71,7 @@ private:
     HotkeyRegistry& registry;
 
     Core::System& system;
+    std::unique_ptr<ConfigurationShared::TranslationMap> translations;
     std::forward_list<ConfigurationShared::Tab*> tab_group;
 
     std::unique_ptr<ConfigureAudio> audio_tab;
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index d332c9b7b..6d387b5c3 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <QLabel>
+#include <qnamespace.h>
 #include "common/settings.h"
 #include "core/core.h"
 #include "ui_configure_graphics_advanced.h"
@@ -9,94 +11,54 @@
 
 ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(
     const Core::System& system_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group, QWidget* parent)
-    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureGraphicsAdvanced>()}, system{system_} {
+    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    const ConfigurationShared::TranslationMap& translations_, QWidget* parent)
+    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureGraphicsAdvanced>()}, system{system_},
+      translations{translations_} {
 
     ui->setupUi(this);
 
-    SetupPerGameUI();
-
     SetConfiguration();
 
-    ui->enable_compute_pipelines_checkbox->setVisible(false);
+    checkbox_enable_compute_pipelines->setVisible(false);
 }
 
 ConfigureGraphicsAdvanced::~ConfigureGraphicsAdvanced() = default;
 
 void ConfigureGraphicsAdvanced::SetConfiguration() {
     const bool runtime_lock = !system.IsPoweredOn();
-    ui->use_reactive_flushing->setEnabled(runtime_lock);
-    ui->async_present->setEnabled(runtime_lock);
-    ui->renderer_force_max_clock->setEnabled(runtime_lock);
-    ui->astc_recompression_combobox->setEnabled(runtime_lock);
-    ui->use_asynchronous_shaders->setEnabled(runtime_lock);
-    ui->anisotropic_filtering_combobox->setEnabled(runtime_lock);
-    ui->enable_compute_pipelines_checkbox->setEnabled(runtime_lock);
-
-    ui->async_present->setChecked(Settings::values.async_presentation.GetValue());
-    ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue());
-    ui->use_reactive_flushing->setChecked(Settings::values.use_reactive_flushing.GetValue());
-    ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue());
-    ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue());
-    ui->use_vulkan_driver_pipeline_cache->setChecked(
-        Settings::values.use_vulkan_driver_pipeline_cache.GetValue());
-    ui->enable_compute_pipelines_checkbox->setChecked(
-        Settings::values.enable_compute_pipelines.GetValue());
-    ui->use_video_framerate_checkbox->setChecked(Settings::values.use_video_framerate.GetValue());
-    ui->barrier_feedback_loops_checkbox->setChecked(
-        Settings::values.barrier_feedback_loops.GetValue());
-
-    if (Settings::IsConfiguringGlobal()) {
-        ui->gpu_accuracy->setCurrentIndex(
-            static_cast<int>(Settings::values.gpu_accuracy.GetValue()));
-        ui->anisotropic_filtering_combobox->setCurrentIndex(
-            Settings::values.max_anisotropy.GetValue());
-        ui->astc_recompression_combobox->setCurrentIndex(
-            static_cast<int>(Settings::values.astc_recompression.GetValue()));
-    } else {
-        ConfigurationShared::SetPerGameSetting(ui->gpu_accuracy, &Settings::values.gpu_accuracy);
-        ConfigurationShared::SetPerGameSetting(ui->anisotropic_filtering_combobox,
-                                               &Settings::values.max_anisotropy);
-        ConfigurationShared::SetPerGameSetting(ui->astc_recompression_combobox,
-                                               &Settings::values.astc_recompression);
-        ConfigurationShared::SetHighlight(ui->label_gpu_accuracy,
-                                          !Settings::values.gpu_accuracy.UsingGlobal());
-        ConfigurationShared::SetHighlight(ui->af_label,
-                                          !Settings::values.max_anisotropy.UsingGlobal());
-        ConfigurationShared::SetHighlight(ui->label_astc_recompression,
-                                          !Settings::values.astc_recompression.UsingGlobal());
+    auto& layout = *ui->populate_target->layout();
+    std::map<std::string, QWidget*> hold{}; // A map will sort the data for us
+
+    for (auto setting :
+         Settings::values.linkage.by_category[Settings::Category::AdvancedGraphics]) {
+        QWidget* widget = ConfigurationShared::CreateWidget(setting, translations, this,
+                                                            runtime_lock, apply_funcs, trackers);
+
+        if (widget == nullptr) {
+            continue;
+        }
+
+        if (!setting->IsEnum()) {
+            hold.emplace(setting->GetLabel(), widget);
+        } else {
+            layout.addWidget(widget);
+        }
+
+        if (setting->GetLabel() == "enable_compute_pipelines") {
+            checkbox_enable_compute_pipelines = widget;
+        }
+    }
+    for (const auto& [label, widget] : hold) {
+        layout.addWidget(widget);
     }
 }
 
 void ConfigureGraphicsAdvanced::ApplyConfiguration() {
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.gpu_accuracy, ui->gpu_accuracy);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_presentation,
-                                             ui->async_present, async_present);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.renderer_force_max_clock,
-                                             ui->renderer_force_max_clock,
-                                             renderer_force_max_clock);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy,
-                                             ui->anisotropic_filtering_combobox);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_reactive_flushing,
-                                             ui->use_reactive_flushing, use_reactive_flushing);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.astc_recompression,
-                                             ui->astc_recompression_combobox);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders,
-                                             ui->use_asynchronous_shaders,
-                                             use_asynchronous_shaders);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,
-                                             ui->use_fast_gpu_time, use_fast_gpu_time);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache,
-                                             ui->use_vulkan_driver_pipeline_cache,
-                                             use_vulkan_driver_pipeline_cache);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.enable_compute_pipelines,
-                                             ui->enable_compute_pipelines_checkbox,
-                                             enable_compute_pipelines);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_video_framerate,
-                                             ui->use_video_framerate_checkbox, use_video_framerate);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.barrier_feedback_loops,
-                                             ui->barrier_feedback_loops_checkbox,
-                                             barrier_feedback_loops);
+    const bool is_powered_on = system.IsPoweredOn();
+    for (const auto& func : apply_funcs) {
+        func(is_powered_on);
+    }
 }
 
 void ConfigureGraphicsAdvanced::changeEvent(QEvent* event) {
@@ -111,68 +73,6 @@ void ConfigureGraphicsAdvanced::RetranslateUI() {
     ui->retranslateUi(this);
 }
 
-void ConfigureGraphicsAdvanced::SetupPerGameUI() {
-    // Disable if not global (only happens during game)
-    if (Settings::IsConfiguringGlobal()) {
-        ui->gpu_accuracy->setEnabled(Settings::values.gpu_accuracy.UsingGlobal());
-        ui->async_present->setEnabled(Settings::values.async_presentation.UsingGlobal());
-        ui->renderer_force_max_clock->setEnabled(
-            Settings::values.renderer_force_max_clock.UsingGlobal());
-        ui->use_reactive_flushing->setEnabled(Settings::values.use_reactive_flushing.UsingGlobal());
-        ui->astc_recompression_combobox->setEnabled(
-            Settings::values.astc_recompression.UsingGlobal());
-        ui->use_asynchronous_shaders->setEnabled(
-            Settings::values.use_asynchronous_shaders.UsingGlobal());
-        ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal());
-        ui->use_vulkan_driver_pipeline_cache->setEnabled(
-            Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal());
-        ui->anisotropic_filtering_combobox->setEnabled(
-            Settings::values.max_anisotropy.UsingGlobal());
-        ui->enable_compute_pipelines_checkbox->setEnabled(
-            Settings::values.enable_compute_pipelines.UsingGlobal());
-        ui->use_video_framerate_checkbox->setEnabled(
-            Settings::values.use_video_framerate.UsingGlobal());
-        ui->barrier_feedback_loops_checkbox->setEnabled(
-            Settings::values.barrier_feedback_loops.UsingGlobal());
-
-        return;
-    }
-
-    ConfigurationShared::SetColoredTristate(ui->async_present, Settings::values.async_presentation,
-                                            async_present);
-    ConfigurationShared::SetColoredTristate(ui->renderer_force_max_clock,
-                                            Settings::values.renderer_force_max_clock,
-                                            renderer_force_max_clock);
-    ConfigurationShared::SetColoredTristate(
-        ui->use_reactive_flushing, Settings::values.use_reactive_flushing, use_reactive_flushing);
-    ConfigurationShared::SetColoredTristate(ui->use_asynchronous_shaders,
-                                            Settings::values.use_asynchronous_shaders,
-                                            use_asynchronous_shaders);
-    ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time,
-                                            Settings::values.use_fast_gpu_time, use_fast_gpu_time);
-    ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache,
-                                            Settings::values.use_vulkan_driver_pipeline_cache,
-                                            use_vulkan_driver_pipeline_cache);
-    ConfigurationShared::SetColoredTristate(ui->enable_compute_pipelines_checkbox,
-                                            Settings::values.enable_compute_pipelines,
-                                            enable_compute_pipelines);
-    ConfigurationShared::SetColoredTristate(ui->use_video_framerate_checkbox,
-                                            Settings::values.use_video_framerate,
-                                            use_video_framerate);
-    ConfigurationShared::SetColoredTristate(ui->barrier_feedback_loops_checkbox,
-                                            Settings::values.barrier_feedback_loops,
-                                            barrier_feedback_loops);
-    ConfigurationShared::SetColoredComboBox(
-        ui->gpu_accuracy, ui->label_gpu_accuracy,
-        static_cast<int>(Settings::values.gpu_accuracy.GetValue(true)));
-    ConfigurationShared::SetColoredComboBox(
-        ui->anisotropic_filtering_combobox, ui->af_label,
-        static_cast<int>(Settings::values.max_anisotropy.GetValue(true)));
-    ConfigurationShared::SetColoredComboBox(
-        ui->astc_recompression_combobox, ui->label_astc_recompression,
-        static_cast<int>(Settings::values.astc_recompression.GetValue(true)));
-}
-
 void ConfigureGraphicsAdvanced::ExposeComputeOption() {
-    ui->enable_compute_pipelines_checkbox->setVisible(true);
+    checkbox_enable_compute_pipelines->setVisible(true);
 }
diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h
index 585b9cb50..3ac6b4bce 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.h
+++ b/src/yuzu/configuration/configure_graphics_advanced.h
@@ -20,7 +20,7 @@ public:
     explicit ConfigureGraphicsAdvanced(
         const Core::System& system_,
         std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
-        QWidget* parent = nullptr);
+        const ConfigurationShared::TranslationMap& translations_, QWidget* parent = nullptr);
     ~ConfigureGraphicsAdvanced() override;
 
     void ApplyConfiguration() override;
@@ -32,21 +32,13 @@ private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void SetupPerGameUI();
-
     std::unique_ptr<Ui::ConfigureGraphicsAdvanced> ui;
 
-    ConfigurationShared::CheckState async_present;
-    ConfigurationShared::CheckState renderer_force_max_clock;
-    ConfigurationShared::CheckState use_vsync;
-    ConfigurationShared::CheckState async_astc;
-    ConfigurationShared::CheckState use_reactive_flushing;
-    ConfigurationShared::CheckState use_asynchronous_shaders;
-    ConfigurationShared::CheckState use_fast_gpu_time;
-    ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache;
-    ConfigurationShared::CheckState enable_compute_pipelines;
-    ConfigurationShared::CheckState use_video_framerate;
-    ConfigurationShared::CheckState barrier_feedback_loops;
+    std::list<ConfigurationShared::CheckState> trackers{};
 
     const Core::System& system;
+    const ConfigurationShared::TranslationMap& translations;
+    std::forward_list<std::function<void(bool)>> apply_funcs;
+
+    QWidget* checkbox_enable_compute_pipelines{};
 };
diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui
index 859ab9366..113fbc010 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.ui
+++ b/src/yuzu/configuration/configure_graphics_advanced.ui
@@ -26,238 +26,8 @@
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
-         <widget class="QWidget" name="gpu_accuracy_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="label_gpu_accuracy">
-             <property name="text">
-              <string>Accuracy Level:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="gpu_accuracy">
-             <item>
-              <property name="text">
-               <string notr="true">Normal</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string notr="true">High</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string notr="true">Extreme(very slow)</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="astc_recompression_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="leftMargin">
-              <number>0</number>
-            </property>
-            <property name="topMargin">
-              <number>0</number>
-            </property>
-            <property name="rightMargin">
-              <number>0</number>
-            </property>
-            <property name="bottomMargin">
-              <number>0</number>
-            </property>
-            <item>
-              <widget class="QLabel" name="label_astc_recompression">
-              <property name="text">
-                <string>ASTC recompression:</string>
-              </property>
-              </widget>
-            </item>
-            <item>
-              <widget class="QComboBox" name="astc_recompression_combobox">
-                <item>
-                <property name="text">
-                  <string>Uncompressed (Best quality)</string>
-                </property>
-                </item>
-                <item>
-                <property name="text">
-                  <string>BC1 (Low quality)</string>
-                </property>
-                </item>
-                <item>
-                <property name="text">
-                  <string>BC3 (Medium quality)</string>
-                </property>
-                </item>
-              </widget>
-            </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="async_present">
-          <property name="text">
-           <string>Enable asynchronous presentation (Vulkan only)</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="renderer_force_max_clock">
-          <property name="toolTip">
-           <string>Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed.</string>
-          </property>
-          <property name="text">
-           <string>Force maximum clocks (Vulkan only)</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="use_reactive_flushing">
-          <property name="toolTip">
-           <string>Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory.</string>
-          </property>
-          <property name="text">
-           <string>Enable Reactive Flushing</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="use_asynchronous_shaders">
-          <property name="toolTip">
-           <string>Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental.</string>
-          </property>
-          <property name="text">
-           <string>Use asynchronous shader building (Hack)</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="use_fast_gpu_time">
-          <property name="toolTip">
-           <string>Enables Fast GPU Time. This option will force most games to run at their highest native resolution.</string>
-          </property>
-          <property name="text">
-           <string>Use Fast GPU Time (Hack)</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="use_vulkan_driver_pipeline_cache">
-          <property name="toolTip">
-           <string>Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally.</string>
-          </property>
-          <property name="text">
-           <string>Use Vulkan pipeline cache</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="enable_compute_pipelines_checkbox">
-          <property name="toolTip">
-           <string>Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled.
-Compute pipelines are always enabled on all other drivers.</string>
-          </property>
-          <property name="text">
-           <string>Enable Compute Pipelines (Intel Vulkan only)</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="use_video_framerate_checkbox">
-          <property name="toolTip">
-           <string>Run the game at normal speed during video playback, even when the framerate is unlocked.</string>
-          </property>
-          <property name="text">
-           <string>Sync to framerate of video playback</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="barrier_feedback_loops_checkbox">
-          <property name="toolTip">
-           <string>Improves rendering of transparency effects in specific games.</string>
-          </property>
-          <property name="text">
-           <string>Barrier feedback loops</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="af_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_1">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="af_label">
-             <property name="text">
-              <string>Anisotropic Filtering:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="anisotropic_filtering_combobox">
-             <item>
-              <property name="text">
-               <string>Automatic</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Default</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>2x</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>4x</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>8x</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>16x</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
+         <widget class="QWidget" name="populate_target" native="true">
+          <layout class="QVBoxLayout" name="verticalLayout"/>
          </widget>
         </item>
        </layout>
diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index 7ec0bf9d3..339768017 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -41,8 +41,10 @@
 ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name,
                                    std::vector<VkDeviceInfo::Record>& vk_device_records,
                                    Core::System& system_)
-    : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()), title_id{title_id_},
-      system{system_}, tab_group{std::make_shared<std::forward_list<ConfigurationShared::Tab*>>()} {
+    : QDialog(parent),
+      ui(std::make_unique<Ui::ConfigurePerGame>()), title_id{title_id_}, system{system_},
+      translations{ConfigurationShared::InitializeTranslations(this)},
+      tab_group{std::make_shared<std::forward_list<ConfigurationShared::Tab*>>()} {
     const auto file_path = std::filesystem::path(Common::FS::ToU8String(file_name));
     const auto config_file_name = title_id == 0 ? Common::FS::PathToUTF8String(file_path.filename())
                                                 : fmt::format("{:016X}", title_id);
@@ -52,7 +54,8 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
     audio_tab = std::make_unique<ConfigureAudio>(system_, tab_group, this);
     cpu_tab = std::make_unique<ConfigureCpu>(system_, tab_group, this);
     general_tab = std::make_unique<ConfigureGeneral>(system_, tab_group, this);
-    graphics_advanced_tab = std::make_unique<ConfigureGraphicsAdvanced>(system_, tab_group, this);
+    graphics_advanced_tab =
+        std::make_unique<ConfigureGraphicsAdvanced>(system_, tab_group, *translations, this);
     graphics_tab = std::make_unique<ConfigureGraphics>(
         system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
         tab_group, this);
diff --git a/src/yuzu/configuration/configure_per_game.h b/src/yuzu/configuration/configure_per_game.h
index 9fceff414..1e222c2f9 100644
--- a/src/yuzu/configuration/configure_per_game.h
+++ b/src/yuzu/configuration/configure_per_game.h
@@ -75,6 +75,7 @@ private:
     std::unique_ptr<Config> game_config;
 
     Core::System& system;
+    std::unique_ptr<ConfigurationShared::TranslationMap> translations;
     std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> tab_group;
 
     std::unique_ptr<ConfigurePerGameAddons> addons_tab;
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
new file mode 100644
index 000000000..974203f75
--- /dev/null
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -0,0 +1,170 @@
+#include <forward_list>
+#include <map>
+#include <memory>
+#include <string>
+#include <typeindex>
+#include <utility>
+#include <QString>
+#include <QWidget>
+#include "common/settings.h"
+#include "yuzu/configuration/shared_translation.h"
+
+namespace ConfigurationShared {
+
+std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
+    std::unique_ptr<TranslationMap> translations = std::make_unique<TranslationMap>();
+    const auto& tr = [parent](const char* text) -> QString { return parent->tr(text); };
+
+#define INSERT(LABEL, NAME, TOOLTIP)                                                               \
+    translations->insert(std::pair{(LABEL), std::pair{tr((NAME)), tr((TOOLTIP))}})
+
+    // Audio
+    INSERT("output_engine", "Output Engine:", "");
+    INSERT("output_device", "Output Device:", "");
+    INSERT("input_device", "Input Device:", "");
+    INSERT("audio_muted", "Mute audio when in background", "");
+    INSERT("volume", "Volume:", "");
+
+    // Core
+    INSERT("use_multi_core", "Multicore CPU Emulation", "");
+    INSERT("use_unsafe_extended_memory_layout", "Unsafe extended memory layout (8GB DRAM)", "");
+
+    // Cpu
+    INSERT("cpu_accuracy", "Accuracy:", "");
+    INSERT("cpu_debug_mode", "Enable CPU Debugging", "");
+    INSERT("cpuopt_page_tables", "Enable inline page tables", "");
+    INSERT("cpuopt_block_linking", "Enable block linking", "");
+    INSERT("cpuopt_return_stack_buffer", "Enable return stack buffer", "");
+    INSERT("cpuopt_fast_dispatcher", "Enable fast dispatcher", "");
+    INSERT("cpuopt_context_elimination", "Enable context elimination", "");
+    INSERT("cpuopt_const_prop", "Enable constant propagation", "");
+    INSERT("cpuopt_misc_ir", "Enable miscellaneous optimizations", "");
+    INSERT("cpuopt_reduce_misalign_checks", "Enable misalignment check reduction", "");
+    INSERT("cpuopt_fastmem", "Enable Host MMU Emulation (general memory instructions)", "");
+    INSERT("cpuopt_fastmem_exclusives", "Enable Host MMU Emulation (exclusive memory instructions)",
+           "");
+    INSERT("cpuopt_recompile_exclusives", "Enable recompilation of exlucsive memory instructions",
+           "");
+    INSERT("cpuopt_ignore_memory_aborts", "Enable fallbacks for invalid memory accesses", "");
+
+    INSERT("cpuopt_unsafe_unfuse_fma", "Unfuse FMA (improve performance on CPUs without FMA)", "");
+    INSERT("cpuopt_unsafe_reduce_fp_error", "Faster FRSQRTE and FRECPE", "");
+    INSERT("cpuopt_unsafe_ignore_standard_fpcr", "Faster ASIMD instructions (32 bits only)", "");
+    INSERT("cpuopt_unsafe_inaccurate_nan", "Inaccurate NaN handling", "");
+    INSERT("cpuopt_unsafe_fastmem_check", "Disable address space checks", "");
+    INSERT("cpuopt_unsafe_ignore_global_monitor", "Ignore global monitor", "");
+
+    // Renderer
+    INSERT("backend", "API:", "");
+    INSERT("vulkan_device", "Device:", "");
+    INSERT("shader_backend", "Shader Backend:", "");
+    INSERT("resolution_setup", "Resolution:", "");
+    INSERT("scaling_filter", "Window Adapting Filter:", "");
+    INSERT("fsr_sharpening_slider", "AMD FidelityFX™ Super Resolution Sharpness:", "");
+    INSERT("anti_aliasing", "Anti-Aliasing Method:", "");
+    INSERT("fullscreen_mode", "Fullscreen Mode:", "");
+    INSERT("aspect_ratio", "Aspect Ratio:", "");
+    INSERT("use_disk_shader_cache", "Use disk pipeline cache", "");
+    INSERT("use_asynchronous_gpu_emulation", "Use asynchronous GPU emulation", "");
+    INSERT("nvdec_emulation", "NVDEC emulation:", "");
+    INSERT("acclerate_astc", "ASTC Decoding Method:", "");
+    INSERT(
+        "use_vsync", "VSync Mode:",
+        "FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh "
+        "rate. FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. "
+        "Mailbox can have lower latency than FIFO and does not tear but may drop frames. Immediate "
+        "(no synchronization) just presents whatever is available and can exhibit tearing.");
+
+    // Renderer (Advanced Graphics)
+    INSERT("async_presentation", "Enable asynchronous presentation (Vulkan only)", "");
+    INSERT("force_max_clock", "Force maximum clocks (Vulkan only)",
+           "Runs work in the background while waiting for graphics commands to keep the GPU from "
+           "lowering its clock speed.");
+    INSERT("max_anisotropy", "Anisotropic Filtering:", "");
+    INSERT("gpu_accuracy", "Accuracy Level:", "");
+    INSERT("use_asynchronous_shaders", "Use asynchronous shader building (Hack)",
+           "Enables asynchronous shader compilation, which may reduce shader stutter. This feature "
+           "is experimental.");
+    INSERT("use_fast_gpu_time", "Use Fast GPU Time (Hack)",
+           "Enables Fast GPU Time. This option will force most games to run at their highest "
+           "native resolution.");
+    INSERT("use_vulkan_driver_pipeline_cache", "Use Vulkan pipeline cache",
+           "Enables GPU vendor-specific pipeline cache. This option can improve shader loading "
+           "time significantly in cases where the Vulkan driver does not store pipeline cache "
+           "files internally.");
+    INSERT("enable_compute_pipelines", "Enable Compute Pipelines (Intel Vulkan Only)",
+           "Enable compute pipelines, required by some games.\nThis setting only exists for Intel "
+           "proprietary drivers, and may crash if enabled.\nCompute pipelines are always enabled "
+           "on all other drivers.");
+    INSERT("bg_red", "Background Color:", "");
+    INSERT("bg_green", "Background Color:", "");
+    INSERT("bg_blue", "Background Color:", "");
+
+    // Renderer (Debug)
+    INSERT("debug", "Enable Graphics Debugging",
+           "When checked, the graphics API enters a slower debugging mode");
+    INSERT("shader_feedback", "Enable Shader Feedback",
+           "When checked, yuzu will log statistics about the compiled pipeline cache");
+    INSERT("nsight_aftermath", "Enable Nsight Aftermath",
+           "When checked, it enables Nsight Aftermath crash dumps");
+    INSERT("disable_shader_loop_safety_checks", "Disable Loop safety checks",
+           "When checked, it executes shaders without loop logic changes");
+
+    // Renderer (General)
+    INSERT("use_speed_limit", "Limit Speed Percent", "");
+    INSERT("speed_limit", "Limit Speed Percent", "");
+
+    // System
+    INSERT("rng_seed_enabled", "RNG Seed", "");
+    INSERT("rng_seed", "RNG Seed", "");
+    INSERT("device_name", "Device Name", "");
+    INSERT("custom_rtc_enabled", "Custom RTC", "");
+    INSERT("custom_rtc", "Custom RTC", "");
+    INSERT("language_index", "Language:", "");
+    INSERT("region_index", "Region:", "");
+    INSERT("time_zone_index", "Time Zone:", "");
+    INSERT("sound_index", "Sound Output Mode:", "");
+    INSERT("use_docked_mode", "Docked", "");
+
+#undef INSERT
+
+    return translations;
+}
+
+std::forward_list<QString> ComboboxEnumeration(std::type_index type, QWidget* parent) {
+    const auto& tr = [&](const char* text) { return parent->tr(text); };
+
+    if (type == typeid(Settings::AstcDecodeMode)) {
+        return {
+            tr("CPU"),
+            tr("GPU"),
+            tr("CPU Asynchronous"),
+        };
+    } else if (type == typeid(Settings::RendererBackend)) {
+        return {
+            tr("OpenGL"),
+            tr("Vulkan"),
+            tr("Null"),
+        };
+    } else if (type == typeid(Settings::ShaderBackend)) {
+        return {
+            tr("GLSL"),
+            tr("GLASM (Assembly Shaders, NVIDIA Only)"),
+            tr("SPIR-V (Experimental, Mesa Only)"),
+        };
+    } else if (type == typeid(Settings::GPUAccuracy)) {
+        return {
+            tr("Normal"),
+            tr("High"),
+            tr("Extreme"),
+        };
+    } else if (type == typeid(Settings::AnisotropyMode)) {
+        return {
+            tr("Automatic"), tr("Default"), tr("2x"), tr("4x"), tr("8x"), tr("16x"),
+        };
+    }
+
+    return {};
+}
+
+} // namespace ConfigurationShared
diff --git a/src/yuzu/configuration/shared_translation.h b/src/yuzu/configuration/shared_translation.h
new file mode 100644
index 000000000..a81ae9c87
--- /dev/null
+++ b/src/yuzu/configuration/shared_translation.h
@@ -0,0 +1,18 @@
+#include <forward_list>
+#include <map>
+#include <memory>
+#include <string>
+#include <typeindex>
+#include <utility>
+#include <QString>
+
+class QWidget;
+
+namespace ConfigurationShared {
+using TranslationMap = std::map<std::string, std::pair<QString, QString>>;
+
+std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent);
+
+std::forward_list<QString> ComboboxEnumeration(std::type_index type, QWidget* parent);
+
+} // namespace ConfigurationShared
-- 
cgit v1.2.3


From 75d7e40113c03ec6a2a83fb8cfa736a17c6862a3 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 7 May 2023 10:35:28 -0400
Subject: settings: Recategorize a bit

Will help with generating config UI later.
---
 src/common/settings.cpp                            |  7 +-
 src/common/settings.h                              | 87 ++++++++++++----------
 src/yuzu/configuration/config.cpp                  | 12 ++-
 src/yuzu/configuration/configuration_shared.cpp    |  8 +-
 .../configuration/configure_graphics_advanced.cpp  |  2 +-
 src/yuzu_cmd/config.cpp                            |  6 +-
 6 files changed, 77 insertions(+), 45 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 59934803e..38a82f6f7 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -151,14 +151,19 @@ const char* TranslateCategory(Category category) {
     case Category::Core:
         return "Core";
     case Category::Cpu:
+    case Category::CpuDebug:
+    case Category::CpuUnsafe:
         return "Cpu";
     case Category::Renderer:
+    case Category::RendererAdvanced:
+    case Category::RendererDebug:
         return "Renderer";
     case Category::System:
         return "System";
     case Category::DataStorage:
         return "Data Storage";
     case Category::Debugging:
+    case Category::DebuggingGraphics:
         return "Debugging";
     case Category::Miscellaneous:
         return "Miscellaneous";
@@ -188,8 +193,6 @@ const char* TranslateCategory(Category category) {
         return "Paths";
     case Category::MaxEnum:
         break;
-    case Category::AdvancedGraphics:
-        return "Renderer";
     }
     return "Miscellaneous";
 }
diff --git a/src/common/settings.h b/src/common/settings.h
index 48f86d0aa..70ab8d584 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -120,11 +120,15 @@ enum class Category : u32 {
     Audio,
     Core,
     Cpu,
+    CpuDebug,
+    CpuUnsafe,
     Renderer,
-    AdvancedGraphics,
+    RendererAdvanced,
+    RendererDebug,
     System,
     DataStorage,
     Debugging,
+    DebuggingGraphics,
     Miscellaneous,
     Network,
     WebService,
@@ -624,53 +628,56 @@ struct Values {
                                                       "cpu_accuracy",    Category::Cpu};
     // TODO: remove cpu_accuracy_first_time, migration setting added 8 July 2021
     Setting<bool> cpu_accuracy_first_time{linkage, true, "cpu_accuracy_first_time", Category::Cpu};
-    Setting<bool> cpu_debug_mode{linkage, false, "cpu_debug_mode", Category::Cpu};
+    Setting<bool> cpu_debug_mode{linkage, false, "cpu_debug_mode", Category::CpuDebug};
 
-    Setting<bool> cpuopt_page_tables{linkage, true, "cpuopt_page_tables", Category::Cpu};
-    Setting<bool> cpuopt_block_linking{linkage, true, "cpuopt_block_linking", Category::Cpu};
+    Setting<bool> cpuopt_page_tables{linkage, true, "cpuopt_page_tables", Category::CpuDebug};
+    Setting<bool> cpuopt_block_linking{linkage, true, "cpuopt_block_linking", Category::CpuDebug};
     Setting<bool> cpuopt_return_stack_buffer{linkage, true, "cpuopt_return_stack_buffer",
-                                             Category::Cpu};
-    Setting<bool> cpuopt_fast_dispatcher{linkage, true, "cpuopt_fast_dispatcher", Category::Cpu};
+                                             Category::CpuDebug};
+    Setting<bool> cpuopt_fast_dispatcher{linkage, true, "cpuopt_fast_dispatcher",
+                                         Category::CpuDebug};
     Setting<bool> cpuopt_context_elimination{linkage, true, "cpuopt_context_elimination",
-                                             Category::Cpu};
-    Setting<bool> cpuopt_const_prop{linkage, true, "cpuopt_const_prop", Category::Cpu};
-    Setting<bool> cpuopt_misc_ir{linkage, true, "cpuopt_misc_ir", Category::Cpu};
+                                             Category::CpuDebug};
+    Setting<bool> cpuopt_const_prop{linkage, true, "cpuopt_const_prop", Category::CpuDebug};
+    Setting<bool> cpuopt_misc_ir{linkage, true, "cpuopt_misc_ir", Category::CpuDebug};
     Setting<bool> cpuopt_reduce_misalign_checks{linkage, true, "cpuopt_reduce_misalign_checks",
-                                                Category::Cpu};
-    Setting<bool> cpuopt_fastmem{linkage, true, "cpuopt_fastmem", Category::Cpu};
+                                                Category::CpuDebug};
+    Setting<bool> cpuopt_fastmem{linkage, true, "cpuopt_fastmem", Category::CpuDebug};
     Setting<bool> cpuopt_fastmem_exclusives{linkage, true, "cpuopt_fastmem_exclusives",
-                                            Category::Cpu};
+                                            Category::CpuDebug};
     Setting<bool> cpuopt_recompile_exclusives{linkage, true, "cpuopt_recompile_exclusives",
-                                              Category::Cpu};
+                                              Category::CpuDebug};
     Setting<bool> cpuopt_ignore_memory_aborts{linkage, true, "cpuopt_ignore_memory_aborts",
-                                              Category::Cpu};
+                                              Category::CpuDebug};
 
     SwitchableSetting<bool> cpuopt_unsafe_unfuse_fma{linkage, true, "cpuopt_unsafe_unfuse_fma",
-                                                     Category::Cpu};
+                                                     Category::CpuUnsafe};
     SwitchableSetting<bool> cpuopt_unsafe_reduce_fp_error{
-        linkage, true, "cpuopt_unsafe_reduce_fp_error", Category::Cpu};
+        linkage, true, "cpuopt_unsafe_reduce_fp_error", Category::CpuUnsafe};
     SwitchableSetting<bool> cpuopt_unsafe_ignore_standard_fpcr{
-        linkage, true, "cpuopt_unsafe_ignore_standard_fpcr", Category::Cpu};
+        linkage, true, "cpuopt_unsafe_ignore_standard_fpcr", Category::CpuUnsafe};
     SwitchableSetting<bool> cpuopt_unsafe_inaccurate_nan{
-        linkage, true, "cpuopt_unsafe_inaccurate_nan", Category::Cpu};
+        linkage, true, "cpuopt_unsafe_inaccurate_nan", Category::CpuUnsafe};
     SwitchableSetting<bool> cpuopt_unsafe_fastmem_check{
-        linkage, true, "cpuopt_unsafe_fastmem_check", Category::Cpu};
+        linkage, true, "cpuopt_unsafe_fastmem_check", Category::CpuUnsafe};
     SwitchableSetting<bool> cpuopt_unsafe_ignore_global_monitor{
-        linkage, true, "cpuopt_unsafe_ignore_global_monitor", Category::Cpu};
+        linkage, true, "cpuopt_unsafe_ignore_global_monitor", Category::CpuUnsafe};
 
     // Renderer
     SwitchableSetting<RendererBackend, true> renderer_backend{
         linkage,   RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null,
         "backend", Category::Renderer};
     SwitchableSetting<bool> async_presentation{linkage, false, "async_presentation",
-                                               Category::AdvancedGraphics};
+                                               Category::RendererAdvanced};
     SwitchableSetting<bool> renderer_force_max_clock{linkage, false, "force_max_clock",
-                                                     Category::AdvancedGraphics};
-    Setting<bool> renderer_debug{linkage, false, "debug", Category::Renderer};
-    Setting<bool> renderer_shader_feedback{linkage, false, "shader_feedback", Category::Renderer};
-    Setting<bool> enable_nsight_aftermath{linkage, false, "nsight_aftermath", 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::Renderer};
+        linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
     SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer};
 
     ResolutionScalingInfo resolution_info{};
@@ -697,7 +704,7 @@ struct Values {
     SwitchableSetting<int, true> aspect_ratio{linkage, 0, 0, 4, "aspect_ratio", Category::Renderer};
     SwitchableSetting<AnisotropyMode, true> max_anisotropy{
         linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
-        "max_anisotropy", Category::AdvancedGraphics};
+        "max_anisotropy", Category::RendererAdvanced};
     SwitchableSetting<bool, false, false> use_speed_limit{linkage, true, "use_speed_limit",
                                                           Category::Renderer};
     SwitchableSetting<u16, true> speed_limit{linkage, 100,           0,
@@ -706,7 +713,7 @@ struct Values {
                                                   Category::Renderer};
     SwitchableSetting<GPUAccuracy, true, true, true> gpu_accuracy{
         linkage,        GPUAccuracy::High,         GPUAccuracy::Normal, GPUAccuracy::Extreme,
-        "gpu_accuracy", Category::AdvancedGraphics};
+        "gpu_accuracy", Category::RendererAdvanced};
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{
         linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
     SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::GPU,
@@ -728,21 +735,21 @@ struct Values {
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::Renderer};
     SwitchableSetting<bool, false, true, true> use_fast_gpu_time{linkage, true, "use_fast_gpu_time",
-                                                                 Category::AdvancedGraphics};
+                                                                 Category::RendererAdvanced};
     SwitchableSetting<bool, false, true, true> use_vulkan_driver_pipeline_cache{
-        linkage, true, "use_vulkan_driver_pipeline_cache", Category::AdvancedGraphics};
+        linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced};
     SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
-                                                     Category::AdvancedGraphics};
+                                                     Category::RendererAdvanced};
     SwitchableSetting<AstcRecompression, true> astc_recompression{linkage,
                                                                   AstcRecompression::Uncompressed,
                                                                   AstcRecompression::Uncompressed,
                                                                   AstcRecompression::Bc3,
                                                                   "astc_recompression",
-                                                                  Category::AdvancedGraphics};
+                                                                  Category::RendererAdvanced};
     SwitchableSetting<bool> use_video_framerate{linkage, false, "use_video_framerate",
-                                                Category::AdvancedGraphics};
+                                                Category::RendererAdvanced};
     SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops",
-                                                   Category::AdvancedGraphics};
+                                                   Category::RendererAdvanced};
 
     SwitchableSetting<u8> bg_red{linkage, 0, "bg_red", Category::Renderer};
     SwitchableSetting<u8> bg_green{linkage, 0, "bg_green", Category::Renderer};
@@ -855,14 +862,18 @@ struct Values {
     Setting<std::string> program_args{linkage, std::string(), "program_args", Category::Debugging};
     Setting<bool> dump_exefs{linkage, false, "dump_exefs", Category::Debugging};
     Setting<bool> dump_nso{linkage, false, "dump_nso", Category::Debugging};
-    Setting<bool, false, false> dump_shaders{linkage, false, "dump_shaders", Category::Debugging};
-    Setting<bool, false, false> dump_macros{linkage, false, "dump_macros", Category::Debugging};
+    Setting<bool, false, false> dump_shaders{linkage, false, "dump_shaders",
+                                             Category::DebuggingGraphics};
+    Setting<bool, false, false> dump_macros{linkage, false, "dump_macros",
+                                            Category::DebuggingGraphics};
     Setting<bool> enable_fs_access_log{linkage, false, "enable_fs_access_log", Category::Debugging};
     Setting<bool, false, false> reporting_services{linkage, false, "reporting_services",
                                                    Category::Debugging};
     Setting<bool> quest_flag{linkage, false, "quest_flag", Category::Debugging};
-    Setting<bool> disable_macro_jit{linkage, false, "disable_macro_jit", Category::Debugging};
-    Setting<bool> disable_macro_hle{linkage, false, "disable_macro_hle", Category::Debugging};
+    Setting<bool> disable_macro_jit{linkage, false, "disable_macro_jit",
+                                    Category::DebuggingGraphics};
+    Setting<bool> disable_macro_hle{linkage, false, "disable_macro_hle",
+                                    Category::DebuggingGraphics};
     Setting<bool, false, false> extended_logging{linkage, false, "extended_logging",
                                                  Category::Debugging};
     Setting<bool> use_debug_asserts{linkage, false, "use_debug_asserts", Category::Debugging};
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index f274fe4ea..c6a34e787 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -550,6 +550,7 @@ void Config::ReadDebuggingValues() {
         qt_config->value(QStringLiteral("record_frame_times"), false).toBool();
 
     ReadCategory(Settings::Category::Debugging);
+    ReadCategory(Settings::Category::DebuggingGraphics);
 
     qt_config->endGroup();
 }
@@ -635,6 +636,8 @@ void Config::ReadCpuValues() {
     qt_config->beginGroup(QStringLiteral("Cpu"));
 
     ReadCategory(Settings::Category::Cpu);
+    ReadCategory(Settings::Category::CpuDebug);
+    ReadCategory(Settings::Category::CpuUnsafe);
 
     if (Settings::values.cpu_accuracy_first_time) {
         Settings::values.cpu_accuracy.SetValue(Settings::values.cpu_accuracy.GetDefault());
@@ -648,7 +651,8 @@ void Config::ReadRendererValues() {
     qt_config->beginGroup(QStringLiteral("Renderer"));
 
     ReadCategory(Settings::Category::Renderer);
-    ReadCategory(Settings::Category::AdvancedGraphics);
+    ReadCategory(Settings::Category::RendererAdvanced);
+    ReadCategory(Settings::Category::RendererDebug);
 
     qt_config->endGroup();
 }
@@ -1016,6 +1020,7 @@ void Config::SaveDebuggingValues() {
     qt_config->setValue(QStringLiteral("record_frame_times"), Settings::values.record_frame_times);
 
     WriteCategory(Settings::Category::Debugging);
+    WriteCategory(Settings::Category::DebuggingGraphics);
 
     qt_config->endGroup();
 }
@@ -1079,6 +1084,8 @@ void Config::SaveCpuValues() {
     qt_config->beginGroup(QStringLiteral("Cpu"));
 
     WriteCategory(Settings::Category::Cpu);
+    WriteCategory(Settings::Category::CpuDebug);
+    WriteCategory(Settings::Category::CpuUnsafe);
 
     qt_config->endGroup();
 }
@@ -1086,8 +1093,9 @@ void Config::SaveCpuValues() {
 void Config::SaveRendererValues() {
     qt_config->beginGroup(QStringLiteral("Renderer"));
 
-    WriteCategory(Settings::Category::AdvancedGraphics);
     WriteCategory(Settings::Category::Renderer);
+    WriteCategory(Settings::Category::RendererAdvanced);
+    WriteCategory(Settings::Category::RendererDebug);
 
     qt_config->endGroup();
 }
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 44222718c..dc11a318a 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -128,10 +128,16 @@ QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& tra
             return std::pair{translations.at(setting_label).first,
                              translations.at(setting_label).second};
         }
-        LOG_ERROR(Frontend, "Translation map lacks entry for \"{}\"", setting_label);
+        LOG_ERROR(Frontend, "Translation table lacks entry for \"{}\"", setting_label);
         return std::pair{QString::fromStdString(setting_label), QStringLiteral("")};
     }();
 
+    if (label == QStringLiteral("")) {
+        LOG_DEBUG(Frontend, "Translation table has emtpy entry for \"{}\", skipping...",
+                  setting->GetLabel());
+        return widget;
+    }
+
     if (type == typeid(bool)) {
         auto pair = CreateCheckBox(setting, label, parent, trackers);
         widget = pair.first;
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 6d387b5c3..7d79044d4 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -31,7 +31,7 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {
     std::map<std::string, QWidget*> hold{}; // A map will sort the data for us
 
     for (auto setting :
-         Settings::values.linkage.by_category[Settings::Category::AdvancedGraphics]) {
+         Settings::values.linkage.by_category[Settings::Category::RendererAdvanced]) {
         QWidget* widget = ConfigurationShared::CreateWidget(setting, translations, this,
                                                             runtime_lock, apply_funcs, trackers);
 
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index cfc1a5d81..f8cbf8034 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -223,11 +223,15 @@ void Config::ReadValues() {
     ReadCategory(Settings::Category::Audio);
     ReadCategory(Settings::Category::Core);
     ReadCategory(Settings::Category::Cpu);
+    ReadCategory(Settings::Category::CpuDebug);
+    ReadCategory(Settings::Category::CpuUnsafe);
     ReadCategory(Settings::Category::Renderer);
-    ReadCategory(Settings::Category::AdvancedGraphics);
+    ReadCategory(Settings::Category::RendererAdvanced);
+    ReadCategory(Settings::Category::RendererDebug);
     ReadCategory(Settings::Category::System);
     ReadCategory(Settings::Category::DataStorage);
     ReadCategory(Settings::Category::Debugging);
+    ReadCategory(Settings::Category::DebuggingGraphics);
     ReadCategory(Settings::Category::Miscellaneous);
     ReadCategory(Settings::Category::Network);
     ReadCategory(Settings::Category::WebService);
-- 
cgit v1.2.3


From f8435d676f0073dee4d2ea87c84767a53911fbe6 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 7 May 2023 12:03:40 -0400
Subject: configure_graphics: Partial runtime implementation

---
 src/common/settings.h                              |   2 +-
 src/yuzu/configuration/configuration_shared.cpp    |  72 +-
 src/yuzu/configuration/configuration_shared.h      |  18 +-
 src/yuzu/configuration/configure_dialog.cpp        |   2 +-
 src/yuzu/configuration/configure_graphics.cpp      | 785 +++++++++++----------
 src/yuzu/configuration/configure_graphics.h        |  16 +-
 src/yuzu/configuration/configure_graphics.ui       | 751 +-------------------
 .../configuration/configure_graphics_advanced.cpp  |   4 +-
 src/yuzu/configuration/configure_per_game.cpp      |   2 +-
 src/yuzu/configuration/shared_translation.cpp      |   9 +-
 10 files changed, 513 insertions(+), 1148 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 70ab8d584..8f02fa9af 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -733,7 +733,7 @@ struct Values {
         linkage,          ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV,
         "shader_backend", Category::Renderer};
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
-                                                     Category::Renderer};
+                                                     Category::RendererAdvanced};
     SwitchableSetting<bool, false, true, true> use_fast_gpu_time{linkage, true, "use_fast_gpu_time",
                                                                  Category::RendererAdvanced};
     SwitchableSetting<bool, false, true, true> use_vulkan_driver_pipeline_cache{
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index dc11a318a..575d239eb 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -5,6 +5,7 @@
 #include <QCheckBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QLineEdit>
 #include <QObject>
 #include <QString>
 #include <QWidget>
@@ -55,9 +56,8 @@ static std::pair<QWidget*, std::function<void()>> CreateCheckBox(Settings::Basic
     return {checkbox, load_func};
 }
 
-static std::pair<QWidget*, std::function<void()>> CreateCombobox(Settings::BasicSetting* setting,
-                                                                 const QString& label,
-                                                                 QWidget* parent) {
+static std::tuple<QWidget*, void*, std::function<void()>> CreateCombobox(
+    Settings::BasicSetting* setting, const QString& label, QWidget* parent) {
     const auto type = setting->TypeId();
 
     QWidget* group = new QWidget(parent);
@@ -110,15 +110,34 @@ static std::pair<QWidget*, std::function<void()>> CreateCombobox(Settings::Basic
         }
     };
 
-    return {group, load_func};
+    return {group, combobox, load_func};
+}
+
+static std::tuple<QWidget*, void*, std::function<void()>> CreateLineEdit(
+    Settings::BasicSetting* setting, const QString& label, QWidget* parent) {
+    QWidget* widget = new QWidget(parent);
+    QHBoxLayout* layout = new QHBoxLayout(widget);
+
+    QLabel* q_label = new QLabel(label, widget);
+    QLineEdit* line_edit = new QLineEdit(widget);
+
+    layout->addWidget(q_label);
+    layout->addStretch();
+    layout->addWidget(line_edit);
+
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    return {widget, line_edit, []() {}};
 }
 
-QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& translations,
-                      QWidget* parent, bool runtime_lock,
-                      std::forward_list<std::function<void(bool)>>& apply_funcs,
-                      std::list<CheckState>& trackers) {
+std::pair<QWidget*, void*> CreateWidget(Settings::BasicSetting* setting,
+                                        const TranslationMap& translations, QWidget* parent,
+                                        bool runtime_lock,
+                                        std::forward_list<std::function<void(bool)>>& apply_funcs,
+                                        std::list<CheckState>& trackers, RequestType request) {
     const auto type = setting->TypeId();
     QWidget* widget{nullptr};
+    void* extra{nullptr};
 
     std::function<void()> load_func;
 
@@ -135,7 +154,7 @@ QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& tra
     if (label == QStringLiteral("")) {
         LOG_DEBUG(Frontend, "Translation table has emtpy entry for \"{}\", skipping...",
                   setting->GetLabel());
-        return widget;
+        return {nullptr, nullptr};
     }
 
     if (type == typeid(bool)) {
@@ -143,14 +162,36 @@ QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& tra
         widget = pair.first;
         load_func = pair.second;
     } else if (setting->IsEnum()) {
-        auto pair = CreateCombobox(setting, label, parent);
-        widget = pair.first;
-        load_func = pair.second;
+        auto tuple = CreateCombobox(setting, label, parent);
+        widget = std::get<0>(tuple);
+        extra = std::get<1>(tuple);
+        load_func = std::get<2>(tuple);
+    } else if (type == typeid(u32) || type == typeid(int)) {
+        switch (request) {
+        case RequestType::Default: {
+            auto tuple = CreateLineEdit(setting, label, parent);
+            widget = std::get<0>(tuple);
+            extra = std::get<1>(tuple);
+            load_func = std::get<2>(tuple);
+            break;
+        }
+        case RequestType::ComboBox: {
+            auto tuple = CreateCombobox(setting, label, parent);
+            widget = std::get<0>(tuple);
+            extra = std::get<1>(tuple);
+            load_func = std::get<2>(tuple);
+            break;
+        }
+        case RequestType::SpinBox:
+        case RequestType::Slider:
+        case RequestType::MaxEnum:
+            break;
+        }
     }
 
     if (widget == nullptr) {
         LOG_ERROR(Frontend, "No widget was created for \"{}\"", setting->GetLabel());
-        return widget;
+        return {nullptr, nullptr};
     }
 
     apply_funcs.push_front([load_func, setting](bool powered_on) {
@@ -162,13 +203,14 @@ QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& tra
     bool enable = runtime_lock || setting->RuntimeModfiable();
     enable &=
         setting->Switchable() && !(Settings::IsConfiguringGlobal() && !setting->UsingGlobal());
-
+    enable |= !setting->Switchable() && Settings::IsConfiguringGlobal() && runtime_lock;
     widget->setEnabled(enable);
+
     widget->setVisible(Settings::IsConfiguringGlobal() || setting->Switchable());
 
     widget->setToolTip(tooltip);
 
-    return widget;
+    return {widget, extra};
 }
 
 Tab::Tab(std::shared_ptr<std::forward_list<Tab*>> group_, QWidget* parent)
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 7040673ea..d0fe6ea38 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -41,10 +41,20 @@ enum class CheckState {
     Count,  // Simply the number of states, not a valid checkbox state
 };
 
-QWidget* CreateWidget(Settings::BasicSetting* setting, const TranslationMap& translations,
-                      QWidget* parent, bool runtime_lock,
-                      std::forward_list<std::function<void(bool)>>& apply_funcs,
-                      std::list<CheckState>& trackers);
+enum class RequestType {
+    Default,
+    ComboBox,
+    SpinBox,
+    Slider,
+    MaxEnum,
+};
+
+std::pair<QWidget*, void*> CreateWidget(Settings::BasicSetting* setting,
+                                        const TranslationMap& translations, QWidget* parent,
+                                        bool runtime_lock,
+                                        std::forward_list<std::function<void(bool)>>& apply_funcs,
+                                        std::list<CheckState>& trackers,
+                                        RequestType request = RequestType::Default);
 
 // Global-aware apply and set functions
 
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index b3f4764c7..5b356a074 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -43,7 +43,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
           std::make_unique<ConfigureGraphicsAdvanced>(system_, nullptr, *translations, this)},
       graphics_tab{std::make_unique<ConfigureGraphics>(
           system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
-          nullptr, this)},
+          nullptr, *translations, this)},
       hotkeys_tab{std::make_unique<ConfigureHotkeys>(system_.HIDCore(), this)},
       input_tab{std::make_unique<ConfigureInput>(system_, this)},
       network_tab{std::make_unique<ConfigureNetwork>(system_, this)},
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index a8c5b1d9f..8128a4047 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -55,100 +55,123 @@ static constexpr VkPresentModeKHR VSyncSettingToMode(Settings::VSyncMode mode) {
     }
 }
 
-static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode) {
-    switch (mode) {
-    case VK_PRESENT_MODE_IMMEDIATE_KHR:
-        return Settings::VSyncMode::Immediate;
-    case VK_PRESENT_MODE_MAILBOX_KHR:
-        return Settings::VSyncMode::Mailbox;
-    case VK_PRESENT_MODE_FIFO_KHR:
-        return Settings::VSyncMode::FIFO;
-    case VK_PRESENT_MODE_FIFO_RELAXED_KHR:
-        return Settings::VSyncMode::FIFORelaxed;
-    default:
-        return Settings::VSyncMode::FIFO;
-    }
-}
+// static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode) {
+//     switch (mode) {
+//     case VK_PRESENT_MODE_IMMEDIATE_KHR:
+//         return Settings::VSyncMode::Immediate;
+//     case VK_PRESENT_MODE_MAILBOX_KHR:
+//         return Settings::VSyncMode::Mailbox;
+//     case VK_PRESENT_MODE_FIFO_KHR:
+//         return Settings::VSyncMode::FIFO;
+//     case VK_PRESENT_MODE_FIFO_RELAXED_KHR:
+//         return Settings::VSyncMode::FIFORelaxed;
+//     default:
+//         return Settings::VSyncMode::FIFO;
+//     }
+// }
 
 ConfigureGraphics::ConfigureGraphics(
     const Core::System& system_, std::vector<VkDeviceInfo::Record>& records_,
     const std::function<void()>& expose_compute_option_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group, QWidget* parent)
+    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    const ConfigurationShared::TranslationMap& translations_, QWidget* parent)
     : ConfigurationShared::Tab(group, parent), ui{std::make_unique<Ui::ConfigureGraphics>()},
-      records{records_}, expose_compute_option{expose_compute_option_}, system{system_} {
+      records{records_}, expose_compute_option{expose_compute_option_}, system{system_},
+      translations{translations_} {
     vulkan_device = Settings::values.vulkan_device.GetValue();
     RetrieveVulkanDevices();
 
     ui->setupUi(this);
 
+    SetConfiguration();
+
     for (const auto& device : vulkan_devices) {
-        ui->device->addItem(device);
+        vulkan_device_combobox->addItem(device);
     }
 
-    ui->backend->addItem(QStringLiteral("GLSL"));
-    ui->backend->addItem(tr("GLASM (Assembly Shaders, NVIDIA Only)"));
-    ui->backend->addItem(tr("SPIR-V (Experimental, Mesa Only)"));
+    UpdateBackgroundColorButton(QColor::fromRgb(Settings::values.bg_red.GetValue(),
+                                                Settings::values.bg_green.GetValue(),
+                                                Settings::values.bg_blue.GetValue()));
+    UpdateAPILayout();
+    PopulateVSyncModeSelection(); //< must happen after UpdateAPILayout
+    // SetFSRIndicatorText(ui->fsr_sharpening_slider->sliderPosition());
 
-    SetupPerGameUI();
+    // VSync setting needs to be determined after populating the VSync combobox
+    if (Settings::IsConfiguringGlobal()) {
+        const auto vsync_mode_setting = Settings::values.vsync_mode.GetValue();
+        const auto vsync_mode = VSyncSettingToMode(vsync_mode_setting);
+        int index{};
+        for (const auto mode : vsync_mode_combobox_enum_map) {
+            if (mode == vsync_mode) {
+                break;
+            }
+            index++;
+        }
+        if (static_cast<unsigned long>(index) < vsync_mode_combobox_enum_map.size()) {
+            vsync_mode_combobox->setCurrentIndex(index);
+        }
+    }
 
-    SetConfiguration();
+    SetupPerGameUI();
 
-    connect(ui->api, qOverload<int>(&QComboBox::currentIndexChanged), this, [this] {
+    connect(api_combobox, qOverload<int>(&QComboBox::currentIndexChanged), this, [this] {
         UpdateAPILayout();
         PopulateVSyncModeSelection();
         if (!Settings::IsConfiguringGlobal()) {
-            ConfigurationShared::SetHighlight(
-                ui->api_widget, ui->api->currentIndex() != ConfigurationShared::USE_GLOBAL_INDEX);
+            ConfigurationShared::SetHighlight(ui->api_widget,
+                                              api_combobox->currentIndex() !=
+                                                  ConfigurationShared::USE_GLOBAL_INDEX);
         }
     });
-    connect(ui->device, qOverload<int>(&QComboBox::activated), this, [this](int device) {
-        UpdateDeviceSelection(device);
-        PopulateVSyncModeSelection();
-    });
-    connect(ui->backend, qOverload<int>(&QComboBox::activated), this,
+    connect(vulkan_device_combobox, qOverload<int>(&QComboBox::activated), this,
+            [this](int device) {
+                UpdateDeviceSelection(device);
+                PopulateVSyncModeSelection();
+            });
+    connect(shader_backend_combobox, qOverload<int>(&QComboBox::activated), this,
             [this](int backend) { UpdateShaderBackendSelection(backend); });
 
-    connect(ui->bg_button, &QPushButton::clicked, this, [this] {
-        const QColor new_bg_color = QColorDialog::getColor(bg_color);
-        if (!new_bg_color.isValid()) {
-            return;
-        }
-        UpdateBackgroundColorButton(new_bg_color);
-    });
+    // connect(ui->bg_button, &QPushButton::clicked, this, [this] {
+    //     const QColor new_bg_color = QColorDialog::getColor(bg_color);
+    //     if (!new_bg_color.isValid()) {
+    //         return;
+    //     }
+    //     UpdateBackgroundColorButton(new_bg_color);
+    // });
 
-    ui->api->setEnabled(!UISettings::values.has_broken_vulkan && ui->api->isEnabled());
+    api_combobox->setEnabled(!UISettings::values.has_broken_vulkan && api_combobox->isEnabled());
     ui->api_widget->setEnabled(
         (!UISettings::values.has_broken_vulkan || Settings::IsConfiguringGlobal()) &&
         ui->api_widget->isEnabled());
-    ui->bg_label->setVisible(Settings::IsConfiguringGlobal());
-    ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal());
+    // ui->bg_label->setVisible(Settings::IsConfiguringGlobal());
+    // ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal());
 
-    connect(ui->fsr_sharpening_slider, &QSlider::valueChanged, this,
-            &ConfigureGraphics::SetFSRIndicatorText);
-    ui->fsr_sharpening_combobox->setVisible(!Settings::IsConfiguringGlobal());
-    ui->fsr_sharpening_label->setVisible(Settings::IsConfiguringGlobal());
+    // connect(ui->fsr_sharpening_slider, &QSlider::valueChanged, this,
+    //         &ConfigureGraphics::SetFSRIndicatorText);
+    // ui->fsr_sharpening_combobox->setVisible(!Settings::IsConfiguringGlobal());
+    // ui->fsr_sharpening_label->setVisible(Settings::IsConfiguringGlobal());
 }
 
 void ConfigureGraphics::PopulateVSyncModeSelection() {
     const Settings::RendererBackend backend{GetCurrentGraphicsBackend()};
     if (backend == Settings::RendererBackend::Null) {
-        ui->vsync_mode_combobox->setEnabled(false);
+        vsync_mode_combobox->setEnabled(false);
         return;
     }
-    ui->vsync_mode_combobox->setEnabled(true);
+    vsync_mode_combobox->setEnabled(true);
 
     const int current_index = //< current selected vsync mode from combobox
-        ui->vsync_mode_combobox->currentIndex();
+        vsync_mode_combobox->currentIndex();
     const auto current_mode = //< current selected vsync mode as a VkPresentModeKHR
         current_index == -1 ? VSyncSettingToMode(Settings::values.vsync_mode.GetValue())
                             : vsync_mode_combobox_enum_map[current_index];
     int index{};
-    const int device{ui->device->currentIndex()}; //< current selected Vulkan device
+    const int device{vulkan_device_combobox->currentIndex()}; //< current selected Vulkan device
     const auto& present_modes = //< relevant vector of present modes for the selected device or API
         backend == Settings::RendererBackend::Vulkan ? device_present_modes[device]
                                                      : default_present_modes;
 
-    ui->vsync_mode_combobox->clear();
+    vsync_mode_combobox->clear();
     vsync_mode_combobox_enum_map.clear();
     vsync_mode_combobox_enum_map.reserve(present_modes.size());
     for (const auto present_mode : present_modes) {
@@ -157,10 +180,10 @@ void ConfigureGraphics::PopulateVSyncModeSelection() {
             continue;
         }
 
-        ui->vsync_mode_combobox->insertItem(index, mode_name);
+        vsync_mode_combobox->insertItem(index, mode_name);
         vsync_mode_combobox_enum_map.push_back(present_mode);
         if (present_mode == current_mode) {
-            ui->vsync_mode_combobox->setCurrentIndex(index);
+            vsync_mode_combobox->setCurrentIndex(index);
         }
         index++;
     }
@@ -188,114 +211,137 @@ ConfigureGraphics::~ConfigureGraphics() = default;
 
 void ConfigureGraphics::SetConfiguration() {
     const bool runtime_lock = !system.IsPoweredOn();
+    QLayout& api_layout = *ui->api_widget->layout();
+    QLayout& graphics_layout = *ui->graphics_widget->layout();
 
-    ui->api_widget->setEnabled(runtime_lock);
-    ui->use_asynchronous_gpu_emulation->setEnabled(runtime_lock);
-    ui->use_disk_shader_cache->setEnabled(runtime_lock);
-    ui->nvdec_emulation_widget->setEnabled(runtime_lock);
-    ui->resolution_combobox->setEnabled(runtime_lock);
-    ui->astc_decode_mode_combobox->setEnabled(runtime_lock);
-    ui->vsync_mode_layout->setEnabled(runtime_lock ||
-                                      Settings::values.renderer_backend.GetValue() ==
-                                          Settings::RendererBackend::Vulkan);
-    ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue());
-    ui->use_asynchronous_gpu_emulation->setChecked(
-        Settings::values.use_asynchronous_gpu_emulation.GetValue());
+    std::map<std::string, QWidget*> hold_graphics;
 
-    if (Settings::IsConfiguringGlobal()) {
-        ui->api->setCurrentIndex(static_cast<int>(Settings::values.renderer_backend.GetValue()));
-        ui->fullscreen_mode_combobox->setCurrentIndex(
-            static_cast<int>(Settings::values.fullscreen_mode.GetValue()));
-        ui->nvdec_emulation->setCurrentIndex(
-            static_cast<int>(Settings::values.nvdec_emulation.GetValue()));
-        ui->aspect_ratio_combobox->setCurrentIndex(Settings::values.aspect_ratio.GetValue());
-        ui->resolution_combobox->setCurrentIndex(
-            static_cast<int>(Settings::values.resolution_setup.GetValue()));
-        ui->scaling_filter_combobox->setCurrentIndex(
-            static_cast<int>(Settings::values.scaling_filter.GetValue()));
-        ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue());
-        ui->anti_aliasing_combobox->setCurrentIndex(
-            static_cast<int>(Settings::values.anti_aliasing.GetValue()));
-    } else {
-        ConfigurationShared::SetPerGameSetting(ui->api, &Settings::values.renderer_backend);
-        ConfigurationShared::SetHighlight(ui->api_widget,
-                                          !Settings::values.renderer_backend.UsingGlobal());
-
-        ConfigurationShared::SetPerGameSetting(ui->astc_decode_mode_combobox,
-                                               &Settings::values.accelerate_astc);
-        ConfigurationShared::SetHighlight(ui->astc_decode_mode_layout,
-                                          !Settings::values.accelerate_astc.UsingGlobal());
-
-        ConfigurationShared::SetPerGameSetting(ui->nvdec_emulation,
-                                               &Settings::values.nvdec_emulation);
-        ConfigurationShared::SetHighlight(ui->nvdec_emulation_widget,
-                                          !Settings::values.nvdec_emulation.UsingGlobal());
-
-        ConfigurationShared::SetPerGameSetting(ui->fullscreen_mode_combobox,
-                                               &Settings::values.fullscreen_mode);
-        ConfigurationShared::SetHighlight(ui->fullscreen_mode_label,
-                                          !Settings::values.fullscreen_mode.UsingGlobal());
-
-        ConfigurationShared::SetPerGameSetting(ui->aspect_ratio_combobox,
-                                               &Settings::values.aspect_ratio);
-        ConfigurationShared::SetHighlight(ui->ar_label,
-                                          !Settings::values.aspect_ratio.UsingGlobal());
-
-        ConfigurationShared::SetPerGameSetting(ui->resolution_combobox,
-                                               &Settings::values.resolution_setup);
-        ConfigurationShared::SetHighlight(ui->resolution_label,
-                                          !Settings::values.resolution_setup.UsingGlobal());
-
-        ConfigurationShared::SetPerGameSetting(ui->scaling_filter_combobox,
-                                               &Settings::values.scaling_filter);
-        ConfigurationShared::SetHighlight(ui->scaling_filter_label,
-                                          !Settings::values.scaling_filter.UsingGlobal());
-
-        ConfigurationShared::SetPerGameSetting(ui->anti_aliasing_combobox,
-                                               &Settings::values.anti_aliasing);
-        ConfigurationShared::SetHighlight(ui->anti_aliasing_label,
-                                          !Settings::values.anti_aliasing.UsingGlobal());
-
-        ui->fsr_sharpening_combobox->setCurrentIndex(
-            Settings::values.fsr_sharpening_slider.UsingGlobal() ? 0 : 1);
-        ui->fsr_sharpening_slider->setEnabled(
-            !Settings::values.fsr_sharpening_slider.UsingGlobal());
-        ui->fsr_sharpening_value->setEnabled(!Settings::values.fsr_sharpening_slider.UsingGlobal());
-        ConfigurationShared::SetHighlight(ui->fsr_sharpening_layout,
-                                          !Settings::values.fsr_sharpening_slider.UsingGlobal());
-        ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue());
-
-        ui->bg_combobox->setCurrentIndex(Settings::values.bg_red.UsingGlobal() ? 0 : 1);
-        ui->bg_button->setEnabled(!Settings::values.bg_red.UsingGlobal());
-        ConfigurationShared::SetHighlight(ui->bg_layout, !Settings::values.bg_red.UsingGlobal());
-    }
-    UpdateBackgroundColorButton(QColor::fromRgb(Settings::values.bg_red.GetValue(),
-                                                Settings::values.bg_green.GetValue(),
-                                                Settings::values.bg_blue.GetValue()));
-    UpdateAPILayout();
-    PopulateVSyncModeSelection(); //< must happen after UpdateAPILayout
-    SetFSRIndicatorText(ui->fsr_sharpening_slider->sliderPosition());
+    for (const auto setting : Settings::values.linkage.by_category[Settings::Category::Renderer]) {
+        const auto& setting_label = setting->GetLabel();
 
-    // VSync setting needs to be determined after populating the VSync combobox
-    if (Settings::IsConfiguringGlobal()) {
-        const auto vsync_mode_setting = Settings::values.vsync_mode.GetValue();
-        const auto vsync_mode = VSyncSettingToMode(vsync_mode_setting);
-        int index{};
-        for (const auto mode : vsync_mode_combobox_enum_map) {
-            if (mode == vsync_mode) {
-                break;
+        auto [widget, extra] = [&]() {
+            if (setting_label == "vulkan_device") {
+                return ConfigurationShared::CreateWidget(
+                    setting, translations, this, runtime_lock, apply_funcs, trackers,
+                    ConfigurationShared::RequestType::ComboBox);
             }
-            index++;
+            return ConfigurationShared::CreateWidget(setting, translations, this, runtime_lock,
+                                                     apply_funcs, trackers);
+        }();
+
+        if (widget == nullptr) {
+            continue;
         }
-        if (static_cast<unsigned long>(index) < vsync_mode_combobox_enum_map.size()) {
-            ui->vsync_mode_combobox->setCurrentIndex(index);
+
+        if (setting_label == "backend") {
+            api_layout.addWidget(widget);
+            api_combobox = reinterpret_cast<QComboBox*>(extra);
+        } else if (setting_label == "vulkan_device") {
+            api_layout.addWidget(widget);
+            vulkan_device_combobox = reinterpret_cast<QComboBox*>(extra);
+            vulkan_device_widget = widget;
+        } else if (setting_label == "shader_backend") {
+            api_layout.addWidget(widget);
+            shader_backend_combobox = reinterpret_cast<QComboBox*>(extra);
+            shader_backend_widget = widget;
+        } else {
+            hold_graphics.insert(std::pair(setting_label, widget));
         }
+
+        if (setting_label == "use_vsync") {
+            vsync_mode_combobox = reinterpret_cast<QComboBox*>(extra);
+        }
+    }
+
+    for (const auto& [label, widget] : hold_graphics) {
+        graphics_layout.addWidget(widget);
     }
+
+    // ui->api_widget->setEnabled(runtime_lock);
+    // ui->use_asynchronous_gpu_emulation->setEnabled(runtime_lock);
+    // ui->use_disk_shader_cache->setEnabled(runtime_lock);
+    // ui->nvdec_emulation_widget->setEnabled(runtime_lock);
+    // ui->resolution_combobox->setEnabled(runtime_lock);
+    // ui->astc_decode_mode_combobox->setEnabled(runtime_lock);
+    // ui->vsync_mode_layout->setEnabled(runtime_lock ||
+    //                                   Settings::values.renderer_backend.GetValue() ==
+    //                                       Settings::RendererBackend::Vulkan);
+    // ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue());
+    // ui->use_asynchronous_gpu_emulation->setChecked(
+    //     Settings::values.use_asynchronous_gpu_emulation.GetValue());
+
+    // if (Settings::IsConfiguringGlobal()) {
+    //     api_combobox->setCurrentIndex(static_cast<int>(Settings::values.renderer_backend.GetValue()));
+    //     ui->fullscreen_mode_combobox->setCurrentIndex(
+    //         static_cast<int>(Settings::values.fullscreen_mode.GetValue()));
+    //     ui->nvdec_emulation->setCurrentIndex(
+    //         static_cast<int>(Settings::values.nvdec_emulation.GetValue()));
+    //     ui->aspect_ratio_combobox->setCurrentIndex(Settings::values.aspect_ratio.GetValue());
+    //     ui->resolution_combobox->setCurrentIndex(
+    //         static_cast<int>(Settings::values.resolution_setup.GetValue()));
+    //     ui->scaling_filter_combobox->setCurrentIndex(
+    //         static_cast<int>(Settings::values.scaling_filter.GetValue()));
+    //     ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue());
+    //     ui->anti_aliasing_combobox->setCurrentIndex(
+    //         static_cast<int>(Settings::values.anti_aliasing.GetValue()));
+    // } else {
+    //     ConfigurationShared::SetPerGameSetting(api_combobox, &Settings::values.renderer_backend);
+    //     ConfigurationShared::SetHighlight(ui->api_widget,
+    //                                       !Settings::values.renderer_backend.UsingGlobal());
+
+    //     ConfigurationShared::SetPerGameSetting(ui->astc_decode_mode_combobox,
+    //                                            &Settings::values.accelerate_astc);
+    //     ConfigurationShared::SetHighlight(ui->astc_decode_mode_layout,
+    //                                       !Settings::values.accelerate_astc.UsingGlobal());
+
+    //     ConfigurationShared::SetPerGameSetting(ui->nvdec_emulation,
+    //                                            &Settings::values.nvdec_emulation);
+    //     ConfigurationShared::SetHighlight(ui->nvdec_emulation_widget,
+    //                                       !Settings::values.nvdec_emulation.UsingGlobal());
+
+    //     ConfigurationShared::SetPerGameSetting(ui->fullscreen_mode_combobox,
+    //                                            &Settings::values.fullscreen_mode);
+    //     ConfigurationShared::SetHighlight(ui->fullscreen_mode_label,
+    //                                       !Settings::values.fullscreen_mode.UsingGlobal());
+
+    //     ConfigurationShared::SetPerGameSetting(ui->aspect_ratio_combobox,
+    //                                            &Settings::values.aspect_ratio);
+    //     ConfigurationShared::SetHighlight(ui->ar_label,
+    //                                       !Settings::values.aspect_ratio.UsingGlobal());
+
+    //     ConfigurationShared::SetPerGameSetting(ui->resolution_combobox,
+    //                                            &Settings::values.resolution_setup);
+    //     ConfigurationShared::SetHighlight(ui->resolution_label,
+    //                                       !Settings::values.resolution_setup.UsingGlobal());
+
+    //     ConfigurationShared::SetPerGameSetting(ui->scaling_filter_combobox,
+    //                                            &Settings::values.scaling_filter);
+    //     ConfigurationShared::SetHighlight(ui->scaling_filter_label,
+    //                                       !Settings::values.scaling_filter.UsingGlobal());
+
+    //     ConfigurationShared::SetPerGameSetting(ui->anti_aliasing_combobox,
+    //                                            &Settings::values.anti_aliasing);
+    //     ConfigurationShared::SetHighlight(ui->anti_aliasing_label,
+    //                                       !Settings::values.anti_aliasing.UsingGlobal());
+
+    //     ui->fsr_sharpening_combobox->setCurrentIndex(
+    //         Settings::values.fsr_sharpening_slider.UsingGlobal() ? 0 : 1);
+    //     ui->fsr_sharpening_slider->setEnabled(
+    //         !Settings::values.fsr_sharpening_slider.UsingGlobal());
+    //     ui->fsr_sharpening_value->setEnabled(!Settings::values.fsr_sharpening_slider.UsingGlobal());
+    //     ConfigurationShared::SetHighlight(ui->fsr_sharpening_layout,
+    //                                       !Settings::values.fsr_sharpening_slider.UsingGlobal());
+    //     ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue());
+
+    // ui->bg_combobox->setCurrentIndex(Settings::values.bg_red.UsingGlobal() ? 0 : 1);
+    // ui->bg_button->setEnabled(!Settings::values.bg_red.UsingGlobal());
+    // ConfigurationShared::SetHighlight(ui->bg_layout, !Settings::values.bg_red.UsingGlobal());
+    // }
 }
 
 void ConfigureGraphics::SetFSRIndicatorText(int percentage) {
-    ui->fsr_sharpening_value->setText(
-        tr("%1%", "FSR sharpening percentage (e.g. 50%)").arg(100 - (percentage / 2)));
+    // ui->fsr_sharpening_value->setText(
+    //     tr("%1%", "FSR sharpening percentage (e.g. 50%)").arg(100 - (percentage / 2)));
 }
 
 const QString ConfigureGraphics::TranslateVSyncMode(VkPresentModeKHR mode,
@@ -320,131 +366,134 @@ const QString ConfigureGraphics::TranslateVSyncMode(VkPresentModeKHR mode,
 }
 
 void ConfigureGraphics::ApplyConfiguration() {
-    const auto resolution_setup = static_cast<Settings::ResolutionSetup>(
-        ui->resolution_combobox->currentIndex() -
-        ((Settings::IsConfiguringGlobal()) ? 0 : ConfigurationShared::USE_GLOBAL_OFFSET));
-
-    const auto scaling_filter = static_cast<Settings::ScalingFilter>(
-        ui->scaling_filter_combobox->currentIndex() -
-        ((Settings::IsConfiguringGlobal()) ? 0 : ConfigurationShared::USE_GLOBAL_OFFSET));
-
-    const auto anti_aliasing = static_cast<Settings::AntiAliasing>(
-        ui->anti_aliasing_combobox->currentIndex() -
-        ((Settings::IsConfiguringGlobal()) ? 0 : ConfigurationShared::USE_GLOBAL_OFFSET));
-
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.fullscreen_mode,
-                                             ui->fullscreen_mode_combobox);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.aspect_ratio,
-                                             ui->aspect_ratio_combobox);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_disk_shader_cache,
-                                             ui->use_disk_shader_cache, use_disk_shader_cache);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
-                                             ui->use_asynchronous_gpu_emulation,
-                                             use_asynchronous_gpu_emulation);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.accelerate_astc,
-                                             ui->astc_decode_mode_combobox);
-
-    if (Settings::IsConfiguringGlobal()) {
-        // Guard if during game and set to game-specific value
-        if (Settings::values.renderer_backend.UsingGlobal()) {
-            Settings::values.renderer_backend.SetValue(GetCurrentGraphicsBackend());
-        }
-        if (Settings::values.nvdec_emulation.UsingGlobal()) {
-            Settings::values.nvdec_emulation.SetValue(GetCurrentNvdecEmulation());
-        }
-        if (Settings::values.shader_backend.UsingGlobal()) {
-            Settings::values.shader_backend.SetValue(shader_backend);
-        }
-        if (Settings::values.vulkan_device.UsingGlobal()) {
-            Settings::values.vulkan_device.SetValue(vulkan_device);
-        }
-        if (Settings::values.bg_red.UsingGlobal()) {
-            Settings::values.bg_red.SetValue(static_cast<u8>(bg_color.red()));
-            Settings::values.bg_green.SetValue(static_cast<u8>(bg_color.green()));
-            Settings::values.bg_blue.SetValue(static_cast<u8>(bg_color.blue()));
-        }
-        if (Settings::values.resolution_setup.UsingGlobal()) {
-            Settings::values.resolution_setup.SetValue(resolution_setup);
-        }
-        if (Settings::values.scaling_filter.UsingGlobal()) {
-            Settings::values.scaling_filter.SetValue(scaling_filter);
-        }
-        if (Settings::values.anti_aliasing.UsingGlobal()) {
-            Settings::values.anti_aliasing.SetValue(anti_aliasing);
-        }
-        Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value());
-
-        const auto mode = vsync_mode_combobox_enum_map[ui->vsync_mode_combobox->currentIndex()];
-        const auto vsync_mode = PresentModeToSetting(mode);
-        Settings::values.vsync_mode.SetValue(vsync_mode);
-    } else {
-        if (ui->resolution_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-            Settings::values.resolution_setup.SetGlobal(true);
-        } else {
-            Settings::values.resolution_setup.SetGlobal(false);
-            Settings::values.resolution_setup.SetValue(resolution_setup);
-        }
-        if (ui->scaling_filter_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-            Settings::values.scaling_filter.SetGlobal(true);
-        } else {
-            Settings::values.scaling_filter.SetGlobal(false);
-            Settings::values.scaling_filter.SetValue(scaling_filter);
-        }
-        if (ui->anti_aliasing_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-            Settings::values.anti_aliasing.SetGlobal(true);
-        } else {
-            Settings::values.anti_aliasing.SetGlobal(false);
-            Settings::values.anti_aliasing.SetValue(anti_aliasing);
-        }
-        if (ui->api->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-            Settings::values.renderer_backend.SetGlobal(true);
-            Settings::values.shader_backend.SetGlobal(true);
-            Settings::values.vulkan_device.SetGlobal(true);
-        } else {
-            Settings::values.renderer_backend.SetGlobal(false);
-            Settings::values.renderer_backend.SetValue(GetCurrentGraphicsBackend());
-            switch (GetCurrentGraphicsBackend()) {
-            case Settings::RendererBackend::OpenGL:
-            case Settings::RendererBackend::Null:
-                Settings::values.shader_backend.SetGlobal(false);
-                Settings::values.vulkan_device.SetGlobal(true);
-                Settings::values.shader_backend.SetValue(shader_backend);
-                break;
-            case Settings::RendererBackend::Vulkan:
-                Settings::values.shader_backend.SetGlobal(true);
-                Settings::values.vulkan_device.SetGlobal(false);
-                Settings::values.vulkan_device.SetValue(vulkan_device);
-                break;
-            }
-        }
-
-        if (ui->nvdec_emulation->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-            Settings::values.nvdec_emulation.SetGlobal(true);
-        } else {
-            Settings::values.nvdec_emulation.SetGlobal(false);
-            Settings::values.nvdec_emulation.SetValue(GetCurrentNvdecEmulation());
-        }
-
-        if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-            Settings::values.bg_red.SetGlobal(true);
-            Settings::values.bg_green.SetGlobal(true);
-            Settings::values.bg_blue.SetGlobal(true);
-        } else {
-            Settings::values.bg_red.SetGlobal(false);
-            Settings::values.bg_green.SetGlobal(false);
-            Settings::values.bg_blue.SetGlobal(false);
-            Settings::values.bg_red.SetValue(static_cast<u8>(bg_color.red()));
-            Settings::values.bg_green.SetValue(static_cast<u8>(bg_color.green()));
-            Settings::values.bg_blue.SetValue(static_cast<u8>(bg_color.blue()));
-        }
-
-        if (ui->fsr_sharpening_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-            Settings::values.fsr_sharpening_slider.SetGlobal(true);
-        } else {
-            Settings::values.fsr_sharpening_slider.SetGlobal(false);
-            Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value());
-        }
-    }
+    // const auto resolution_setup = static_cast<Settings::ResolutionSetup>(
+    //     ui->resolution_combobox->currentIndex() -
+    //     ((Settings::IsConfiguringGlobal()) ? 0 : ConfigurationShared::USE_GLOBAL_OFFSET));
+
+    // const auto scaling_filter = static_cast<Settings::ScalingFilter>(
+    //     ui->scaling_filter_combobox->currentIndex() -
+    //     ((Settings::IsConfiguringGlobal()) ? 0 : ConfigurationShared::USE_GLOBAL_OFFSET));
+
+    // const auto anti_aliasing = static_cast<Settings::AntiAliasing>(
+    //     ui->anti_aliasing_combobox->currentIndex() -
+    //     ((Settings::IsConfiguringGlobal()) ? 0 : ConfigurationShared::USE_GLOBAL_OFFSET));
+
+    // ConfigurationShared::ApplyPerGameSetting(&Settings::values.fullscreen_mode,
+    //                                          ui->fullscreen_mode_combobox);
+    // ConfigurationShared::ApplyPerGameSetting(&Settings::values.aspect_ratio,
+    //                                          ui->aspect_ratio_combobox);
+    // ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_disk_shader_cache,
+    //                                          ui->use_disk_shader_cache, use_disk_shader_cache);
+    // ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
+    //                                          ui->use_asynchronous_gpu_emulation,
+    //                                          use_asynchronous_gpu_emulation);
+    // ConfigurationShared::ApplyPerGameSetting(&Settings::values.accelerate_astc,
+    //                                          ui->astc_decode_mode_combobox);
+
+    // if (Settings::IsConfiguringGlobal()) {
+    //     // Guard if during game and set to game-specific value
+    //     if (Settings::values.renderer_backend.UsingGlobal()) {
+    //         Settings::values.renderer_backend.SetValue(GetCurrentGraphicsBackend());
+    //     }
+    //     if (Settings::values.nvdec_emulation.UsingGlobal()) {
+    //         Settings::values.nvdec_emulation.SetValue(GetCurrentNvdecEmulation());
+    //     }
+    //     if (Settings::values.shader_backend.UsingGlobal()) {
+    //         Settings::values.shader_backend.SetValue(shader_backend);
+    //     }
+    //     if (Settings::values.vulkan_device.UsingGlobal()) {
+    //         Settings::values.vulkan_device.SetValue(vulkan_device);
+    //     }
+    //     if (Settings::values.bg_red.UsingGlobal()) {
+    //         Settings::values.bg_red.SetValue(static_cast<u8>(bg_color.red()));
+    //         Settings::values.bg_green.SetValue(static_cast<u8>(bg_color.green()));
+    //         Settings::values.bg_blue.SetValue(static_cast<u8>(bg_color.blue()));
+    //     }
+    //     if (Settings::values.resolution_setup.UsingGlobal()) {
+    //         Settings::values.resolution_setup.SetValue(resolution_setup);
+    //     }
+    //     if (Settings::values.scaling_filter.UsingGlobal()) {
+    //         Settings::values.scaling_filter.SetValue(scaling_filter);
+    //     }
+    //     if (Settings::values.anti_aliasing.UsingGlobal()) {
+    //         Settings::values.anti_aliasing.SetValue(anti_aliasing);
+    //     }
+    //     Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value());
+
+    //     const auto mode = vsync_mode_combobox_enum_map[vsync_mode_combobox->currentIndex()];
+    //     const auto vsync_mode = PresentModeToSetting(mode);
+    //     Settings::values.vsync_mode.SetValue(vsync_mode);
+    // } else {
+    //     if (ui->resolution_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
+    //         Settings::values.resolution_setup.SetGlobal(true);
+    //     } else {
+    //         Settings::values.resolution_setup.SetGlobal(false);
+    //         Settings::values.resolution_setup.SetValue(resolution_setup);
+    //     }
+    //     if (ui->scaling_filter_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX)
+    //     {
+    //         Settings::values.scaling_filter.SetGlobal(true);
+    //     } else {
+    //         Settings::values.scaling_filter.SetGlobal(false);
+    //         Settings::values.scaling_filter.SetValue(scaling_filter);
+    //     }
+    //     if (ui->anti_aliasing_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX)
+    //     {
+    //         Settings::values.anti_aliasing.SetGlobal(true);
+    //     } else {
+    //         Settings::values.anti_aliasing.SetGlobal(false);
+    //         Settings::values.anti_aliasing.SetValue(anti_aliasing);
+    //     }
+    //     if (api_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
+    //         Settings::values.renderer_backend.SetGlobal(true);
+    //         Settings::values.shader_backend.SetGlobal(true);
+    //         Settings::values.vulkan_device.SetGlobal(true);
+    //     } else {
+    //         Settings::values.renderer_backend.SetGlobal(false);
+    //         Settings::values.renderer_backend.SetValue(GetCurrentGraphicsBackend());
+    //         switch (GetCurrentGraphicsBackend()) {
+    //         case Settings::RendererBackend::OpenGL:
+    //         case Settings::RendererBackend::Null:
+    //             Settings::values.shader_backend.SetGlobal(false);
+    //             Settings::values.vulkan_device.SetGlobal(true);
+    //             Settings::values.shader_backend.SetValue(shader_backend);
+    //             break;
+    //         case Settings::RendererBackend::Vulkan:
+    //             Settings::values.shader_backend.SetGlobal(true);
+    //             Settings::values.vulkan_device.SetGlobal(false);
+    //             Settings::values.vulkan_device.SetValue(vulkan_device);
+    //             break;
+    //         }
+    //     }
+
+    //     if (ui->nvdec_emulation->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
+    //         Settings::values.nvdec_emulation.SetGlobal(true);
+    //     } else {
+    //         Settings::values.nvdec_emulation.SetGlobal(false);
+    //         Settings::values.nvdec_emulation.SetValue(GetCurrentNvdecEmulation());
+    //     }
+
+    //     if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
+    //         Settings::values.bg_red.SetGlobal(true);
+    //         Settings::values.bg_green.SetGlobal(true);
+    //         Settings::values.bg_blue.SetGlobal(true);
+    //     } else {
+    //         Settings::values.bg_red.SetGlobal(false);
+    //         Settings::values.bg_green.SetGlobal(false);
+    //         Settings::values.bg_blue.SetGlobal(false);
+    //         Settings::values.bg_red.SetValue(static_cast<u8>(bg_color.red()));
+    //         Settings::values.bg_green.SetValue(static_cast<u8>(bg_color.green()));
+    //         Settings::values.bg_blue.SetValue(static_cast<u8>(bg_color.blue()));
+    //     }
+
+    //     if (ui->fsr_sharpening_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX)
+    //     {
+    //         Settings::values.fsr_sharpening_slider.SetGlobal(true);
+    //     } else {
+    //         Settings::values.fsr_sharpening_slider.SetGlobal(false);
+    //         Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value());
+    //     }
+    // }
 }
 
 void ConfigureGraphics::changeEvent(QEvent* event) {
@@ -462,43 +511,43 @@ void ConfigureGraphics::RetranslateUI() {
 void ConfigureGraphics::UpdateBackgroundColorButton(QColor color) {
     bg_color = color;
 
-    QPixmap pixmap(ui->bg_button->size());
-    pixmap.fill(bg_color);
+    // QPixmap pixmap(ui->bg_button->size());
+    // pixmap.fill(bg_color);
 
-    const QIcon color_icon(pixmap);
-    ui->bg_button->setIcon(color_icon);
+    // const QIcon color_icon(pixmap);
+    // ui->bg_button->setIcon(color_icon);
 }
 
 void ConfigureGraphics::UpdateAPILayout() {
     if (!Settings::IsConfiguringGlobal() &&
-        ui->api->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
+        api_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
         vulkan_device = Settings::values.vulkan_device.GetValue(true);
         shader_backend = Settings::values.shader_backend.GetValue(true);
-        ui->device_widget->setEnabled(false);
-        ui->backend_widget->setEnabled(false);
+        vulkan_device_widget->setEnabled(false);
+        shader_backend_widget->setEnabled(false);
     } else {
         vulkan_device = Settings::values.vulkan_device.GetValue();
         shader_backend = Settings::values.shader_backend.GetValue();
-        ui->device_widget->setEnabled(true);
-        ui->backend_widget->setEnabled(true);
+        vulkan_device_widget->setEnabled(true);
+        shader_backend_widget->setEnabled(true);
     }
 
     switch (GetCurrentGraphicsBackend()) {
     case Settings::RendererBackend::OpenGL:
-        ui->backend->setCurrentIndex(static_cast<u32>(shader_backend));
-        ui->device_widget->setVisible(false);
-        ui->backend_widget->setVisible(true);
+        shader_backend_combobox->setCurrentIndex(static_cast<u32>(shader_backend));
+        vulkan_device_widget->setVisible(false);
+        shader_backend_widget->setVisible(true);
         break;
     case Settings::RendererBackend::Vulkan:
-        if (static_cast<int>(vulkan_device) < ui->device->count()) {
-            ui->device->setCurrentIndex(vulkan_device);
+        if (static_cast<int>(vulkan_device) < vulkan_device_combobox->count()) {
+            vulkan_device_combobox->setCurrentIndex(vulkan_device);
         }
-        ui->device_widget->setVisible(true);
-        ui->backend_widget->setVisible(false);
+        vulkan_device_widget->setVisible(true);
+        shader_backend_widget->setVisible(false);
         break;
     case Settings::RendererBackend::Null:
-        ui->device_widget->setVisible(false);
-        ui->backend_widget->setVisible(false);
+        vulkan_device_widget->setVisible(false);
+        shader_backend_widget->setVisible(false);
         break;
     }
 }
@@ -520,92 +569,94 @@ void ConfigureGraphics::RetrieveVulkanDevices() {
 
 Settings::RendererBackend ConfigureGraphics::GetCurrentGraphicsBackend() const {
     if (Settings::IsConfiguringGlobal()) {
-        return static_cast<Settings::RendererBackend>(ui->api->currentIndex());
+        return static_cast<Settings::RendererBackend>(api_combobox->currentIndex());
     }
 
-    if (ui->api->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
+    if (api_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
         Settings::values.renderer_backend.SetGlobal(true);
         return Settings::values.renderer_backend.GetValue();
     }
     Settings::values.renderer_backend.SetGlobal(false);
-    return static_cast<Settings::RendererBackend>(ui->api->currentIndex() -
+    return static_cast<Settings::RendererBackend>(api_combobox->currentIndex() -
                                                   ConfigurationShared::USE_GLOBAL_OFFSET);
 }
 
 Settings::NvdecEmulation ConfigureGraphics::GetCurrentNvdecEmulation() const {
-    if (Settings::IsConfiguringGlobal()) {
-        return static_cast<Settings::NvdecEmulation>(ui->nvdec_emulation->currentIndex());
-    }
-
-    if (ui->nvdec_emulation->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
-        Settings::values.nvdec_emulation.SetGlobal(true);
-        return Settings::values.nvdec_emulation.GetValue();
-    }
-    Settings::values.nvdec_emulation.SetGlobal(false);
-    return static_cast<Settings::NvdecEmulation>(ui->nvdec_emulation->currentIndex() -
-                                                 ConfigurationShared::USE_GLOBAL_OFFSET);
+    return Settings::NvdecEmulation::CPU;
+    // if (Settings::IsConfiguringGlobal()) {
+    //     return static_cast<Settings::NvdecEmulation>(ui->nvdec_emulation->currentIndex());
+    // }
+
+    // if (ui->nvdec_emulation->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
+    //     Settings::values.nvdec_emulation.SetGlobal(true);
+    //     return Settings::values.nvdec_emulation.GetValue();
+    // }
+    // Settings::values.nvdec_emulation.SetGlobal(false);
+    // return static_cast<Settings::NvdecEmulation>(ui->nvdec_emulation->currentIndex() -
+    //                                              ConfigurationShared::USE_GLOBAL_OFFSET);
 }
 
 void ConfigureGraphics::SetupPerGameUI() {
-    if (Settings::IsConfiguringGlobal()) {
-        ui->api->setEnabled(Settings::values.renderer_backend.UsingGlobal());
-        ui->device->setEnabled(Settings::values.renderer_backend.UsingGlobal());
-        ui->fullscreen_mode_combobox->setEnabled(Settings::values.fullscreen_mode.UsingGlobal());
-        ui->aspect_ratio_combobox->setEnabled(Settings::values.aspect_ratio.UsingGlobal());
-        ui->resolution_combobox->setEnabled(Settings::values.resolution_setup.UsingGlobal());
-        ui->scaling_filter_combobox->setEnabled(Settings::values.scaling_filter.UsingGlobal());
-        ui->fsr_sharpening_slider->setEnabled(Settings::values.fsr_sharpening_slider.UsingGlobal());
-        ui->anti_aliasing_combobox->setEnabled(Settings::values.anti_aliasing.UsingGlobal());
-        ui->use_asynchronous_gpu_emulation->setEnabled(
-            Settings::values.use_asynchronous_gpu_emulation.UsingGlobal());
-        ui->nvdec_emulation->setEnabled(Settings::values.nvdec_emulation.UsingGlobal());
-        ui->astc_decode_mode_combobox->setEnabled(Settings::values.accelerate_astc.UsingGlobal());
-        ui->use_disk_shader_cache->setEnabled(Settings::values.use_disk_shader_cache.UsingGlobal());
-        ui->bg_button->setEnabled(Settings::values.bg_red.UsingGlobal());
-        ui->fsr_slider_layout->setEnabled(Settings::values.fsr_sharpening_slider.UsingGlobal());
-
-        return;
-    }
-
-    connect(ui->bg_combobox, qOverload<int>(&QComboBox::activated), this, [this](int index) {
-        ui->bg_button->setEnabled(index == 1);
-        ConfigurationShared::SetHighlight(ui->bg_layout, index == 1);
-    });
-
-    connect(ui->fsr_sharpening_combobox, qOverload<int>(&QComboBox::activated), this,
-            [this](int index) {
-                ui->fsr_sharpening_slider->setEnabled(index == 1);
-                ui->fsr_sharpening_value->setEnabled(index == 1);
-                ConfigurationShared::SetHighlight(ui->fsr_sharpening_layout, index == 1);
-            });
-
-    ConfigurationShared::SetColoredTristate(
-        ui->use_disk_shader_cache, Settings::values.use_disk_shader_cache, use_disk_shader_cache);
-    ConfigurationShared::SetColoredTristate(ui->use_asynchronous_gpu_emulation,
-                                            Settings::values.use_asynchronous_gpu_emulation,
-                                            use_asynchronous_gpu_emulation);
-
-    ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label,
-                                            Settings::values.aspect_ratio.GetValue(true));
-    ConfigurationShared::SetColoredComboBox(
-        ui->fullscreen_mode_combobox, ui->fullscreen_mode_label,
-        static_cast<int>(Settings::values.fullscreen_mode.GetValue(true)));
-    ConfigurationShared::SetColoredComboBox(
-        ui->resolution_combobox, ui->resolution_label,
-        static_cast<int>(Settings::values.resolution_setup.GetValue(true)));
-    ConfigurationShared::SetColoredComboBox(
-        ui->scaling_filter_combobox, ui->scaling_filter_label,
-        static_cast<int>(Settings::values.scaling_filter.GetValue(true)));
-    ConfigurationShared::SetColoredComboBox(
-        ui->anti_aliasing_combobox, ui->anti_aliasing_label,
-        static_cast<int>(Settings::values.anti_aliasing.GetValue(true)));
-    ConfigurationShared::SetColoredComboBox(
-        ui->astc_decode_mode_combobox, ui->astc_decode_mode_label,
-        static_cast<int>(Settings::values.accelerate_astc.GetValue(true)));
-    ConfigurationShared::InsertGlobalItem(
-        ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true)));
-    ConfigurationShared::InsertGlobalItem(
-        ui->nvdec_emulation, static_cast<int>(Settings::values.nvdec_emulation.GetValue(true)));
-
-    ui->vsync_mode_layout->setVisible(false);
+    // if (Settings::IsConfiguringGlobal()) {
+    //     api_combobox->setEnabled(Settings::values.renderer_backend.UsingGlobal());
+    //     vulkan_device_combobox->setEnabled(Settings::values.renderer_backend.UsingGlobal());
+    //     ui->fullscreen_mode_combobox->setEnabled(Settings::values.fullscreen_mode.UsingGlobal());
+    //     ui->aspect_ratio_combobox->setEnabled(Settings::values.aspect_ratio.UsingGlobal());
+    //     ui->resolution_combobox->setEnabled(Settings::values.resolution_setup.UsingGlobal());
+    //     ui->scaling_filter_combobox->setEnabled(Settings::values.scaling_filter.UsingGlobal());
+    //     ui->fsr_sharpening_slider->setEnabled(Settings::values.fsr_sharpening_slider.UsingGlobal());
+    //     ui->anti_aliasing_combobox->setEnabled(Settings::values.anti_aliasing.UsingGlobal());
+    //     ui->use_asynchronous_gpu_emulation->setEnabled(
+    //         Settings::values.use_asynchronous_gpu_emulation.UsingGlobal());
+    //     ui->nvdec_emulation->setEnabled(Settings::values.nvdec_emulation.UsingGlobal());
+    //     ui->astc_decode_mode_combobox->setEnabled(Settings::values.accelerate_astc.UsingGlobal());
+    //     ui->use_disk_shader_cache->setEnabled(Settings::values.use_disk_shader_cache.UsingGlobal());
+    //     ui->bg_button->setEnabled(Settings::values.bg_red.UsingGlobal());
+    //     ui->fsr_slider_layout->setEnabled(Settings::values.fsr_sharpening_slider.UsingGlobal());
+
+    //     return;
+    // }
+
+    // connect(ui->bg_combobox, qOverload<int>(&QComboBox::activated), this, [this](int index) {
+    //     ui->bg_button->setEnabled(index == 1);
+    //     ConfigurationShared::SetHighlight(ui->bg_layout, index == 1);
+    // });
+
+    // connect(ui->fsr_sharpening_combobox, qOverload<int>(&QComboBox::activated), this,
+    //         [this](int index) {
+    //             ui->fsr_sharpening_slider->setEnabled(index == 1);
+    //             ui->fsr_sharpening_value->setEnabled(index == 1);
+    //             ConfigurationShared::SetHighlight(ui->fsr_sharpening_layout, index == 1);
+    //         });
+
+    // ConfigurationShared::SetColoredTristate(
+    //     ui->use_disk_shader_cache, Settings::values.use_disk_shader_cache,
+    //     use_disk_shader_cache);
+    // ConfigurationShared::SetColoredTristate(ui->use_asynchronous_gpu_emulation,
+    //                                         Settings::values.use_asynchronous_gpu_emulation,
+    //                                         use_asynchronous_gpu_emulation);
+
+    // ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label,
+    //                                         Settings::values.aspect_ratio.GetValue(true));
+    // ConfigurationShared::SetColoredComboBox(
+    //     ui->fullscreen_mode_combobox, ui->fullscreen_mode_label,
+    //     static_cast<int>(Settings::values.fullscreen_mode.GetValue(true)));
+    // ConfigurationShared::SetColoredComboBox(
+    //     ui->resolution_combobox, ui->resolution_label,
+    //     static_cast<int>(Settings::values.resolution_setup.GetValue(true)));
+    // ConfigurationShared::SetColoredComboBox(
+    //     ui->scaling_filter_combobox, ui->scaling_filter_label,
+    //     static_cast<int>(Settings::values.scaling_filter.GetValue(true)));
+    // ConfigurationShared::SetColoredComboBox(
+    //     ui->anti_aliasing_combobox, ui->anti_aliasing_label,
+    //     static_cast<int>(Settings::values.anti_aliasing.GetValue(true)));
+    // ConfigurationShared::SetColoredComboBox(
+    //     ui->astc_decode_mode_combobox, ui->astc_decode_mode_label,
+    //     static_cast<int>(Settings::values.accelerate_astc.GetValue(true)));
+    // ConfigurationShared::InsertGlobalItem(
+    //     api_combobox, static_cast<int>(Settings::values.renderer_backend.GetValue(true)));
+    // ConfigurationShared::InsertGlobalItem(
+    //     ui->nvdec_emulation, static_cast<int>(Settings::values.nvdec_emulation.GetValue(true)));
+
+    // ui->vsync_mode_layout->setVisible(false);
 }
diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h
index adc3faffa..30dfb6163 100644
--- a/src/yuzu/configuration/configure_graphics.h
+++ b/src/yuzu/configuration/configure_graphics.h
@@ -17,6 +17,7 @@
 
 class QEvent;
 class QObject;
+class QComboBox;
 
 namespace Settings {
 enum class NvdecEmulation : u32;
@@ -38,6 +39,7 @@ public:
                                std::vector<VkDeviceInfo::Record>& records,
                                const std::function<void()>& expose_compute_option_,
                                std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                               const ConfigurationShared::TranslationMap& translations_,
                                QWidget* parent = nullptr);
     ~ConfigureGraphics() override;
 
@@ -70,10 +72,8 @@ private:
     std::unique_ptr<Ui::ConfigureGraphics> ui;
     QColor bg_color;
 
-    ConfigurationShared::CheckState use_nvdec_emulation;
-    ConfigurationShared::CheckState accelerate_astc;
-    ConfigurationShared::CheckState use_disk_shader_cache;
-    ConfigurationShared::CheckState use_asynchronous_gpu_emulation;
+    std::list<ConfigurationShared::CheckState> trackers{};
+    std::forward_list<std::function<void(bool)>> apply_funcs{};
 
     std::vector<VkDeviceInfo::Record>& records;
     std::vector<QString> vulkan_devices;
@@ -86,4 +86,12 @@ private:
     const std::function<void()>& expose_compute_option;
 
     const Core::System& system;
+    const ConfigurationShared::TranslationMap& translations;
+
+    QComboBox* vulkan_device_combobox;
+    QComboBox* api_combobox;
+    QComboBox* shader_backend_combobox;
+    QComboBox* vsync_mode_combobox;
+    QWidget* vulkan_device_widget;
+    QWidget* shader_backend_widget;
 };
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 91b09625b..565429c98 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -43,112 +43,6 @@
            <property name="horizontalSpacing">
             <number>6</number>
            </property>
-           <item row="4" column="0">
-            <widget class="QWidget" name="backend_widget" native="true">
-             <layout class="QHBoxLayout" name="backend_layout">
-              <property name="leftMargin">
-               <number>0</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QLabel" name="backend_label">
-                <property name="text">
-                 <string>Shader Backend:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QComboBox" name="backend"/>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <widget class="QWidget" name="device_widget" native="true">
-             <layout class="QHBoxLayout" name="device_layout">
-              <property name="leftMargin">
-               <number>0</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QLabel" name="device_label">
-                <property name="text">
-                 <string>Device:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QComboBox" name="device"/>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="0" column="0">
-            <widget class="QWidget" name="api_layout_2" native="true">
-             <layout class="QHBoxLayout" name="api_layout">
-              <property name="leftMargin">
-               <number>0</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QLabel" name="api_label">
-                <property name="text">
-                 <string>API:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QComboBox" name="api">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string notr="true">OpenGL</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string notr="true">Vulkan</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>None</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
           </layout>
          </widget>
         </item>
@@ -168,649 +62,8 @@
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
         <item>
-         <widget class="QCheckBox" name="use_disk_shader_cache">
-          <property name="text">
-           <string>Use disk pipeline cache</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="use_asynchronous_gpu_emulation">
-          <property name="text">
-           <string>Use asynchronous GPU emulation</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="vsync_mode_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="vsync_mode_label">
-             <property name="text">
-              <string>VSync Mode:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="vsync_mode_combobox">
-             <property name="toolTip">
-              <string>FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate.
-FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down.
-Mailbox can have lower latency than FIFO and does not tear but may drop frames.
-Immediate (no synchronization) just presents whatever is available and can exhibit tearing.</string>
-             </property>
-             <property name="currentText">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="astc_decode_mode_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_8">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="astc_decode_mode_label">
-             <property name="text">
-              <string>ASTC Texture Decoding Method:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="astc_decode_mode_combobox">
-             <item>
-              <property name="text">
-               <string>CPU</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>GPU Compute</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>CPU Asynchronous (Hack)</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="nvdec_emulation_widget" native="true">
-          <layout class="QHBoxLayout" name="nvdec_emulation_layout">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="nvdec_emulation_label">
-             <property name="text">
-              <string>NVDEC emulation:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="nvdec_emulation">
-             <item>
-              <property name="text">
-               <string>No Video Output</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>CPU Video Decoding</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>GPU Video Decoding (Default)</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="fullscreen_mode_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_1">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="fullscreen_mode_label">
-             <property name="text">
-              <string>Fullscreen Mode:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="fullscreen_mode_combobox">
-             <item>
-              <property name="text">
-               <string>Borderless Windowed</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Exclusive Fullscreen</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="aspect_ratio_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="ar_label">
-             <property name="text">
-              <string>Aspect Ratio:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="aspect_ratio_combobox">
-             <item>
-              <property name="text">
-               <string>Default (16:9)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Force 4:3</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Force 21:9</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Force 16:10</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Stretch to Window</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="resolution_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_5">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="resolution_label">
-             <property name="text">
-              <string>Resolution:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="resolution_combobox">
-             <item>
-              <property name="text">
-               <string>0.5X  (360p/540p) [EXPERIMENTAL]</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>0.75X (540p/810p) [EXPERIMENTAL]</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>1X (720p/1080p)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>1.5X (1080p/1620p) [EXPERIMENTAL]</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>2X (1440p/2160p)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>3X (2160p/3240p)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>4X (2880p/4320p)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>5X (3600p/5400p)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>6X (4320p/6480p)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>7X (5040p/7560p)</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>8X (5760p/8640p)</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="scaling_filter_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_6">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="scaling_filter_label">
-             <property name="text">
-              <string>Window Adapting Filter:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="scaling_filter_combobox">
-             <item>
-              <property name="text">
-               <string>Nearest Neighbor</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Bilinear</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Bicubic</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Gaussian</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>ScaleForce</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>AMD FidelityFX™️ Super Resolution</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="anti_aliasing_layout" native="true">
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="anti_aliasing_label">
-             <property name="text">
-              <string>Anti-Aliasing Method:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="anti_aliasing_combobox">
-             <item>
-              <property name="text">
-               <string>None</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>FXAA</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>SMAA</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="fsr_sharpening_layout" native="true">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
-           <property name="sizeConstraint">
-            <enum>QLayout::SetDefaultConstraint</enum>
-           </property>
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <layout class="QHBoxLayout" name="fsr_sharpening_label_group">
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QComboBox" name="fsr_sharpening_combobox">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <item>
-                <property name="text">
-                 <string>Use global FSR Sharpness</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Set FSR Sharpness</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="fsr_sharpening_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>FSR Sharpness:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="fsr_slider_layout">
-             <property name="spacing">
-              <number>6</number>
-             </property>
-             <item>
-              <widget class="QSlider" name="fsr_sharpening_slider">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="baseSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximum">
-                <number>200</number>
-               </property>
-               <property name="sliderPosition">
-                <number>25</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="fsr_sharpening_value">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>32</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>100%</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="bg_layout" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_3">
-           <property name="spacing">
-            <number>6</number>
-           </property>
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QComboBox" name="bg_combobox">
-             <property name="currentText">
-              <string>Use global background color</string>
-             </property>
-             <property name="currentIndex">
-              <number>0</number>
-             </property>
-             <property name="maxVisibleItems">
-              <number>10</number>
-             </property>
-             <item>
-              <property name="text">
-               <string>Use global background color</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Set background color:</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="bg_label">
-             <property name="text">
-              <string>Background Color:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="bg_button">
-             <property name="maximumSize">
-              <size>
-               <width>40</width>
-               <height>16777215</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-          </layout>
+         <widget class="QWidget" name="graphics_widget" native="true">
+          <layout class="QVBoxLayout" name="verticalLayout"/>
          </widget>
         </item>
        </layout>
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 7d79044d4..8a9495109 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -32,8 +32,8 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {
 
     for (auto setting :
          Settings::values.linkage.by_category[Settings::Category::RendererAdvanced]) {
-        QWidget* widget = ConfigurationShared::CreateWidget(setting, translations, this,
-                                                            runtime_lock, apply_funcs, trackers);
+        auto [widget, extra] = ConfigurationShared::CreateWidget(
+            setting, translations, this, runtime_lock, apply_funcs, trackers);
 
         if (widget == nullptr) {
             continue;
diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index 339768017..9e229977d 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -58,7 +58,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
         std::make_unique<ConfigureGraphicsAdvanced>(system_, tab_group, *translations, this);
     graphics_tab = std::make_unique<ConfigureGraphics>(
         system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
-        tab_group, this);
+        tab_group, *translations, this);
     input_tab = std::make_unique<ConfigureInputPerGame>(system_, game_config.get(), this);
     system_tab = std::make_unique<ConfigureSystem>(system_, tab_group, this);
 
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index ddc7569f1..73c3086ae 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -36,6 +36,7 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
 
     // Cpu
     INSERT("cpu_accuracy", "Accuracy:", "");
+    INSERT("cpu_accuracy_first_time", "", "");
 
     // Cpu Debug
     INSERT("cpu_debug_mode", "Enable CPU Debugging", "");
@@ -75,13 +76,16 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
     INSERT("use_disk_shader_cache", "Use disk pipeline cache", "");
     INSERT("use_asynchronous_gpu_emulation", "Use asynchronous GPU emulation", "");
     INSERT("nvdec_emulation", "NVDEC emulation:", "");
-    INSERT("acclerate_astc", "ASTC Decoding Method:", "");
+    INSERT("accelerate_astc", "ASTC Decoding Method:", "");
     INSERT(
         "use_vsync", "VSync Mode:",
         "FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh "
         "rate. FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. "
         "Mailbox can have lower latency than FIFO and does not tear but may drop frames. Immediate "
         "(no synchronization) just presents whatever is available and can exhibit tearing.");
+    INSERT("bg_red", "", "");
+    INSERT("bg_green", "", "");
+    INSERT("bg_blue", "", "");
 
     // Renderer (Advanced Graphics)
     INSERT("async_presentation", "Enable asynchronous presentation (Vulkan only)", "");
@@ -104,9 +108,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
            "Enable compute pipelines, required by some games.\nThis setting only exists for Intel "
            "proprietary drivers, and may crash if enabled.\nCompute pipelines are always enabled "
            "on all other drivers.");
-    INSERT("bg_red", "Background Color:", "");
-    INSERT("bg_green", "Background Color:", "");
-    INSERT("bg_blue", "Background Color:", "");
 
     // Renderer (Debug)
     INSERT("debug", "Enable Graphics Debugging",
-- 
cgit v1.2.3


From bafd569b4768d3888798db8b8e71359b4b844579 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 7 May 2023 12:51:12 -0400
Subject: settings,uisettings: Add IDs to settings

---
 src/common/settings.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 8f02fa9af..69777421e 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -191,6 +191,7 @@ public:
     virtual bool IsEnum() const = 0;
     virtual bool RuntimeModfiable() const = 0;
     virtual void SetGlobal(bool global) {}
+    virtual u32 Id() const = 0;
     virtual bool UsingGlobal() const {
         return false;
     }
@@ -200,6 +201,7 @@ class Linkage {
 public:
     std::map<Category, std::forward_list<BasicSetting*>> by_category;
     std::vector<std::function<void()>> restore_functions;
+    u32 count;
 };
 
 /** The Setting class is a simple resource manager. It defines a label and default value
@@ -232,8 +234,10 @@ public:
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
                      enum Category category_)
         requires(!ranged)
-        : value{default_val}, default_value{default_val}, label{name}, category{category_} {
+        : value{default_val},
+          default_value{default_val}, label{name}, category{category_}, id{linkage.count} {
         linkage.by_category[category].push_front(this);
+        linkage.count++;
     }
     virtual ~Setting() = default;
 
@@ -251,8 +255,9 @@ public:
                      const Type& max_val, const std::string& name, enum Category category_)
         requires(ranged)
         : value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val},
-          label{name}, category{category_} {
+          label{name}, category{category_}, id{linkage.count} {
         linkage.by_category[category].push_front(this);
+        linkage.count++;
     }
 
     /**
@@ -418,6 +423,10 @@ public:
         return std::type_index(typeid(Type));
     }
 
+    virtual u32 Id() const override {
+        return id;
+    }
+
 protected:
     Type value{};                 ///< The setting
     const Type default_value{};   ///< The default value
@@ -425,6 +434,7 @@ protected:
     const Type minimum{};         ///< Minimum allowed value of the setting
     const std::string label{};    ///< The setting's label
     const enum Category category; ///< The setting's category AKA INI group
+    const u32 id;
 };
 
 /**
@@ -728,7 +738,7 @@ struct Values {
         linkage,     VSyncMode::FIFO,   VSyncMode::Immediate, VSyncMode::FIFORelaxed,
         "use_vsync", Category::Renderer};
     SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
-                                                  Category::Renderer};
+                                                  Category::RendererAdvanced};
     SwitchableSetting<ShaderBackend, true> shader_backend{
         linkage,          ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV,
         "shader_backend", Category::Renderer};
-- 
cgit v1.2.3


From cfb63c68dbdc2c8add45cddb2cedf371059af6c4 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 7 May 2023 13:28:52 -0400
Subject: shared_translation: Finish using int ids

---
 src/common/settings.h                              |   4 +-
 src/yuzu/configuration/configuration_shared.cpp    |   6 +-
 src/yuzu/configuration/configure_graphics.cpp      |  25 +--
 .../configuration/configure_graphics_advanced.cpp  |   2 +-
 src/yuzu/configuration/shared_translation.cpp      | 236 +++++++++------------
 src/yuzu/configuration/shared_translation.h        |   2 +-
 6 files changed, 117 insertions(+), 158 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 69777421e..a90fc87a7 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -191,7 +191,7 @@ public:
     virtual bool IsEnum() const = 0;
     virtual bool RuntimeModfiable() const = 0;
     virtual void SetGlobal(bool global) {}
-    virtual u32 Id() const = 0;
+    virtual constexpr u32 Id() const = 0;
     virtual bool UsingGlobal() const {
         return false;
     }
@@ -423,7 +423,7 @@ public:
         return std::type_index(typeid(Type));
     }
 
-    virtual u32 Id() const override {
+    virtual constexpr u32 Id() const override {
         return id;
     }
 
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 575d239eb..54fbce53a 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -136,6 +136,7 @@ std::pair<QWidget*, void*> CreateWidget(Settings::BasicSetting* setting,
                                         std::forward_list<std::function<void(bool)>>& apply_funcs,
                                         std::list<CheckState>& trackers, RequestType request) {
     const auto type = setting->TypeId();
+    const int id = setting->Id();
     QWidget* widget{nullptr};
     void* extra{nullptr};
 
@@ -143,9 +144,8 @@ std::pair<QWidget*, void*> CreateWidget(Settings::BasicSetting* setting,
 
     const auto [label, tooltip] = [&]() {
         const auto& setting_label = setting->GetLabel();
-        if (translations.contains(setting_label)) {
-            return std::pair{translations.at(setting_label).first,
-                             translations.at(setting_label).second};
+        if (translations.contains(id)) {
+            return std::pair{translations.at(id).first, translations.at(id).second};
         }
         LOG_ERROR(Frontend, "Translation table lacks entry for \"{}\"", setting_label);
         return std::pair{QString::fromStdString(setting_label), QStringLiteral("")};
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 8128a4047..d8e95b9b1 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -214,13 +214,13 @@ void ConfigureGraphics::SetConfiguration() {
     QLayout& api_layout = *ui->api_widget->layout();
     QLayout& graphics_layout = *ui->graphics_widget->layout();
 
-    std::map<std::string, QWidget*> hold_graphics;
+    std::map<bool, std::map<std::string, QWidget*>> hold_graphics;
 
     for (const auto setting : Settings::values.linkage.by_category[Settings::Category::Renderer]) {
         const auto& setting_label = setting->GetLabel();
 
         auto [widget, extra] = [&]() {
-            if (setting_label == "vulkan_device") {
+            if (setting->Id() == Settings::values.vulkan_device.Id()) {
                 return ConfigurationShared::CreateWidget(
                     setting, translations, this, runtime_lock, apply_funcs, trackers,
                     ConfigurationShared::RequestType::ComboBox);
@@ -233,28 +233,29 @@ void ConfigureGraphics::SetConfiguration() {
             continue;
         }
 
-        if (setting_label == "backend") {
+        if (setting->Id() == Settings::values.vulkan_device.Id()) {
             api_layout.addWidget(widget);
             api_combobox = reinterpret_cast<QComboBox*>(extra);
-        } else if (setting_label == "vulkan_device") {
+        } else if (setting->Id() == Settings::values.vulkan_device.Id()) {
             api_layout.addWidget(widget);
             vulkan_device_combobox = reinterpret_cast<QComboBox*>(extra);
             vulkan_device_widget = widget;
-        } else if (setting_label == "shader_backend") {
+        } else if (setting->Id() == Settings::values.shader_backend.Id()) {
             api_layout.addWidget(widget);
             shader_backend_combobox = reinterpret_cast<QComboBox*>(extra);
             shader_backend_widget = widget;
-        } else {
-            hold_graphics.insert(std::pair(setting_label, widget));
-        }
-
-        if (setting_label == "use_vsync") {
+        } else if (setting->Id() == Settings::values.vsync_mode.Id()) {
             vsync_mode_combobox = reinterpret_cast<QComboBox*>(extra);
+            hold_graphics[setting->IsEnum()][setting_label] = widget;
+        } else {
+            hold_graphics[setting->IsEnum()][setting_label] = widget;
         }
     }
 
-    for (const auto& [label, widget] : hold_graphics) {
-        graphics_layout.addWidget(widget);
+    for (const auto& [_, settings] : hold_graphics) {
+        for (const auto& [label, widget] : settings) {
+            graphics_layout.addWidget(widget);
+        }
     }
 
     // ui->api_widget->setEnabled(runtime_lock);
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 8a9495109..3a207e2cd 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -45,7 +45,7 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {
             layout.addWidget(widget);
         }
 
-        if (setting->GetLabel() == "enable_compute_pipelines") {
+        if (setting->Id() == Settings::values.enable_compute_pipelines.Id()) {
             checkbox_enable_compute_pipelines = widget;
         }
     }
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 73c3086ae..181dd7cf0 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -18,196 +18,111 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
     std::unique_ptr<TranslationMap> translations = std::make_unique<TranslationMap>();
     const auto& tr = [parent](const char* text) -> QString { return parent->tr(text); };
 
-#define INSERT(LABEL, NAME, TOOLTIP)                                                               \
-    translations->insert(std::pair{(LABEL), std::pair{tr((NAME)), tr((TOOLTIP))}})
+#define INSERT(ID, NAME, TOOLTIP)                                                                  \
+    translations->insert(std::pair{Settings::values.ID.Id(), std::pair{tr((NAME)), tr((TOOLTIP))}})
 
     // A setting can be ignored by giving it a blank name
 
     // Audio
-    INSERT("output_engine", "Output Engine:", "");
-    INSERT("output_device", "Output Device:", "");
-    INSERT("input_device", "Input Device:", "");
-    INSERT("audio_muted", "Mute audio when in background", "");
-    INSERT("volume", "Volume:", "");
+    INSERT(sink_id, "Output Engine:", "");
+    INSERT(audio_output_device_id, "Output Device:", "");
+    INSERT(audio_input_device_id, "Input Device:", "");
+    INSERT(audio_muted, "Mute audio when in background", "");
+    INSERT(volume, "Volume:", "");
 
     // Core
-    INSERT("use_multi_core", "Multicore CPU Emulation", "");
-    INSERT("use_unsafe_extended_memory_layout", "Unsafe extended memory layout (8GB DRAM)", "");
+    INSERT(use_multi_core, "Multicore CPU Emulation", "");
+    INSERT(use_unsafe_extended_memory_layout, "Unsafe extended memory layout (8GB DRAM)", "");
 
     // Cpu
-    INSERT("cpu_accuracy", "Accuracy:", "");
-    INSERT("cpu_accuracy_first_time", "", "");
+    INSERT(cpu_accuracy, "Accuracy:", "");
+    INSERT(cpu_accuracy_first_time, "", "");
 
     // Cpu Debug
-    INSERT("cpu_debug_mode", "Enable CPU Debugging", "");
-    INSERT("cpuopt_page_tables", "Enable inline page tables", "");
-    INSERT("cpuopt_block_linking", "Enable block linking", "");
-    INSERT("cpuopt_return_stack_buffer", "Enable return stack buffer", "");
-    INSERT("cpuopt_fast_dispatcher", "Enable fast dispatcher", "");
-    INSERT("cpuopt_context_elimination", "Enable context elimination", "");
-    INSERT("cpuopt_const_prop", "Enable constant propagation", "");
-    INSERT("cpuopt_misc_ir", "Enable miscellaneous optimizations", "");
-    INSERT("cpuopt_reduce_misalign_checks", "Enable misalignment check reduction", "");
-    INSERT("cpuopt_fastmem", "Enable Host MMU Emulation (general memory instructions)", "");
-    INSERT("cpuopt_fastmem_exclusives", "Enable Host MMU Emulation (exclusive memory instructions)",
-           "");
-    INSERT("cpuopt_recompile_exclusives", "Enable recompilation of exlucsive memory instructions",
-           "");
-    INSERT("cpuopt_ignore_memory_aborts", "Enable fallbacks for invalid memory accesses", "");
 
     // Cpu Unsafe
-    INSERT("cpuopt_unsafe_unfuse_fma", "Unfuse FMA (improve performance on CPUs without FMA)", "");
-    INSERT("cpuopt_unsafe_reduce_fp_error", "Faster FRSQRTE and FRECPE", "");
-    INSERT("cpuopt_unsafe_ignore_standard_fpcr", "Faster ASIMD instructions (32 bits only)", "");
-    INSERT("cpuopt_unsafe_inaccurate_nan", "Inaccurate NaN handling", "");
-    INSERT("cpuopt_unsafe_fastmem_check", "Disable address space checks", "");
-    INSERT("cpuopt_unsafe_ignore_global_monitor", "Ignore global monitor", "");
+    INSERT(cpuopt_unsafe_unfuse_fma, "Unfuse FMA (improve performance on CPUs without FMA)", "");
+    INSERT(cpuopt_unsafe_reduce_fp_error, "Faster FRSQRTE and FRECPE", "");
+    INSERT(cpuopt_unsafe_ignore_standard_fpcr, "Faster ASIMD instructions (32 bits only)", "");
+    INSERT(cpuopt_unsafe_inaccurate_nan, "Inaccurate NaN handling", "");
+    INSERT(cpuopt_unsafe_fastmem_check, "Disable address space checks", "");
+    INSERT(cpuopt_unsafe_ignore_global_monitor, "Ignore global monitor", "");
 
     // Renderer
-    INSERT("backend", "API:", "");
-    INSERT("vulkan_device", "Device:", "");
-    INSERT("shader_backend", "Shader Backend:", "");
-    INSERT("resolution_setup", "Resolution:", "");
-    INSERT("scaling_filter", "Window Adapting Filter:", "");
-    INSERT("fsr_sharpening_slider", "AMD FidelityFX™ Super Resolution Sharpness:", "");
-    INSERT("anti_aliasing", "Anti-Aliasing Method:", "");
-    INSERT("fullscreen_mode", "Fullscreen Mode:", "");
-    INSERT("aspect_ratio", "Aspect Ratio:", "");
-    INSERT("use_disk_shader_cache", "Use disk pipeline cache", "");
-    INSERT("use_asynchronous_gpu_emulation", "Use asynchronous GPU emulation", "");
-    INSERT("nvdec_emulation", "NVDEC emulation:", "");
-    INSERT("accelerate_astc", "ASTC Decoding Method:", "");
+    INSERT(renderer_backend, "API:", "");
+    INSERT(vulkan_device, "Device:", "");
+    INSERT(shader_backend, "Shader Backend:", "");
+    INSERT(resolution_setup, "Resolution:", "");
+    INSERT(scaling_filter, "Window Adapting Filter:", "");
+    INSERT(fsr_sharpening_slider, "AMD FidelityFX™ Super Resolution Sharpness:", "");
+    INSERT(anti_aliasing, "Anti-Aliasing Method:", "");
+    INSERT(fullscreen_mode, "Fullscreen Mode:", "");
+    INSERT(aspect_ratio, "Aspect Ratio:", "");
+    INSERT(use_disk_shader_cache, "Use disk pipeline cache", "");
+    INSERT(use_asynchronous_gpu_emulation, "Use asynchronous GPU emulation", "");
+    INSERT(nvdec_emulation, "NVDEC emulation:", "");
+    INSERT(accelerate_astc, "ASTC Decoding Method:", "");
     INSERT(
-        "use_vsync", "VSync Mode:",
+        vsync_mode, "VSync Mode:",
         "FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh "
         "rate. FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. "
         "Mailbox can have lower latency than FIFO and does not tear but may drop frames. Immediate "
         "(no synchronization) just presents whatever is available and can exhibit tearing.");
-    INSERT("bg_red", "", "");
-    INSERT("bg_green", "", "");
-    INSERT("bg_blue", "", "");
+    INSERT(bg_red, "", "");
+    INSERT(bg_green, "", "");
+    INSERT(bg_blue, "", "");
 
     // Renderer (Advanced Graphics)
-    INSERT("async_presentation", "Enable asynchronous presentation (Vulkan only)", "");
-    INSERT("force_max_clock", "Force maximum clocks (Vulkan only)",
+    INSERT(async_presentation, "Enable asynchronous presentation (Vulkan only)", "");
+    INSERT(renderer_force_max_clock, "Force maximum clocks (Vulkan only)",
            "Runs work in the background while waiting for graphics commands to keep the GPU from "
            "lowering its clock speed.");
-    INSERT("max_anisotropy", "Anisotropic Filtering:", "");
-    INSERT("gpu_accuracy", "Accuracy Level:", "");
-    INSERT("use_asynchronous_shaders", "Use asynchronous shader building (Hack)",
+    INSERT(max_anisotropy, "Anisotropic Filtering:", "");
+    INSERT(gpu_accuracy, "Accuracy Level:", "");
+    INSERT(use_asynchronous_shaders, "Use asynchronous shader building (Hack)",
            "Enables asynchronous shader compilation, which may reduce shader stutter. This feature "
            "is experimental.");
-    INSERT("use_fast_gpu_time", "Use Fast GPU Time (Hack)",
+    INSERT(use_fast_gpu_time, "Use Fast GPU Time (Hack)",
            "Enables Fast GPU Time. This option will force most games to run at their highest "
            "native resolution.");
-    INSERT("use_vulkan_driver_pipeline_cache", "Use Vulkan pipeline cache",
+    INSERT(use_vulkan_driver_pipeline_cache, "Use Vulkan pipeline cache",
            "Enables GPU vendor-specific pipeline cache. This option can improve shader loading "
            "time significantly in cases where the Vulkan driver does not store pipeline cache "
            "files internally.");
-    INSERT("enable_compute_pipelines", "Enable Compute Pipelines (Intel Vulkan Only)",
+    INSERT(enable_compute_pipelines, "Enable Compute Pipelines (Intel Vulkan Only)",
            "Enable compute pipelines, required by some games.\nThis setting only exists for Intel "
            "proprietary drivers, and may crash if enabled.\nCompute pipelines are always enabled "
            "on all other drivers.");
 
     // Renderer (Debug)
-    INSERT("debug", "Enable Graphics Debugging",
-           "When checked, the graphics API enters a slower debugging mode");
-    INSERT("shader_feedback", "Enable Shader Feedback",
-           "When checked, yuzu will log statistics about the compiled pipeline cache");
-    INSERT("nsight_aftermath", "Enable Nsight Aftermath",
-           "When checked, it enables Nsight Aftermath crash dumps");
-    INSERT("disable_shader_loop_safety_checks", "Disable Loop safety checks",
-           "When checked, it executes shaders without loop logic changes");
 
     // Renderer (General)
-    INSERT("use_speed_limit", "Limit Speed Percent", "");
-    INSERT("speed_limit", "Limit Speed Percent", "");
+    INSERT(use_speed_limit, "Limit Speed Percent", "");
+    INSERT(speed_limit, "Limit Speed Percent", "");
 
     // System
-    INSERT("rng_seed_enabled", "RNG Seed", "");
-    INSERT("rng_seed", "RNG Seed", "");
-    INSERT("device_name", "Device Name", "");
-    INSERT("custom_rtc_enabled", "Custom RTC", "");
-    INSERT("custom_rtc", "Custom RTC", "");
-    INSERT("language_index", "Language:", "");
-    INSERT("region_index", "Region:", "");
-    INSERT("time_zone_index", "Time Zone:", "");
-    INSERT("sound_index", "Sound Output Mode:", "");
-    INSERT("use_docked_mode", "", "");
+    INSERT(rng_seed_enabled, "RNG Seed", "");
+    INSERT(rng_seed, "RNG Seed", "");
+    INSERT(device_name, "Device Name", "");
+    INSERT(custom_rtc_enabled, "Custom RTC", "");
+    INSERT(custom_rtc, "Custom RTC", "");
+    INSERT(language_index, "Language:", "");
+    INSERT(region_index, "Region:", "");
+    INSERT(time_zone_index, "Time Zone:", "");
+    INSERT(sound_index, "Sound Output Mode:", "");
+    INSERT(use_docked_mode, "", "");
 
     // Controls
-    INSERT("enable_raw_input", "", "");
-    INSERT("controller_navigation", "", "");
-    INSERT("enable_joycon_driver", "", "");
-    INSERT("enable_procon_driver", "", "");
-    INSERT("vibration_enabled", "", "");
-    INSERT("enable_accurate_vibrations", "", "");
-    INSERT("motion_enabled", "", "");
-    INSERT("udp_input_servers", "", "");
-    INSERT("enable_udp_controller", "", "");
-    INSERT("pause_tas_on_load", "", "");
-    INSERT("tas_enable", "", "");
-    INSERT("tas_loop", "", "");
-    INSERT("mouse_panning", "", "");
-    INSERT("mouse_panning_sensitivity", "", "");
-    INSERT("mouse_enabled", "", "");
-    INSERT("emulate_analog_keyboard", "", "");
-    INSERT("keyboard_enabled", "", "");
-    INSERT("debug_pad_enabled", "", "");
-    INSERT("touch_device", "", "");
-    INSERT("touch_from_button_map", "", "");
-    INSERT("enable_ring_controller", "", "");
-    INSERT("enable_ir_sensor", "", "");
-    INSERT("ir_sensor_device", "", "");
 
     // Data Storage
-    INSERT("use_virtual_sd", "", "");
-    INSERT("gamecard_inserted", "Inserted", "");
-    INSERT("gamecard_current_game", "Current Game", "");
-    INSERT("gamecard_path", "Path", "");
 
     // Debugging
-    INSERT("use_gdbstub", "Enable GDB Stub", "");
-    INSERT("gdbstub_port", "Port:", "");
-    INSERT("program_args", "Arguments String", "");
-    INSERT("dump_exefs", "Dump ExeFS", "");
-    INSERT("dump_nso", "Dump Decompressed NSOs", "");
-    INSERT("enable_fs_access_log", "Enable FS Access Log", "");
-    INSERT("reporting_services", "Enable Verbose Repoting Services**", "");
-    INSERT("quest_flag", "Kiosk (Quest) Mode", "");
-    INSERT("extended_logging", "Enable Extended Logging**",
-           "When checked, the max size of the log increases from 100 MB to 1 GB");
-    INSERT("use_debug_asserts", "Enable Debug Asserts", "");
-    INSERT("use_auto_stub", "Enable Auto-Stub**", "");
-    INSERT("enable_all_controllers", "Enable All Controller Types", "");
-    INSERT("create_crash_dumps", "Create Minidump After Crash", "");
-    INSERT("perform_vulkan_check", "Perform Startup Vulkan Check",
-           "Enables yuzu to check for a working Vulkan environment when the program starts up. "
-           "Disable this if this is causing issues with external programs seeing yuzu.");
-    INSERT("log_filter", "Global Log Filter", "");
-    INSERT("use_dev_keys", "", "");
 
     // Debugging Graphics
-    INSERT("dump_shaders", "Dump Game Shaders",
-           "When checked, it will dump all the original assembler shaders from the disk shader "
-           "cache or game as found");
-    INSERT("disable_macro_jit", "Disable Macro JIT",
-           "When checked, it disables the macro Just In Time compiler. Enabling this makes games "
-           "run slower");
-    INSERT(
-        "disable_macro_hle", "Disable Macro HLE",
-        "When checked, it disables the macro HLE functions. Enabling this makes games run slower");
-    INSERT("dump_macros", "Dump Maxwell Macros",
-           "When checked, it will dump all the macro programs of the GPU");
 
     // Network
-    INSERT("network_interface", "Network Interface", "");
 
     // Web Service
-    INSERT("enable_telemetry", "Share anonymous usage data with the yuzu team", "");
-    INSERT("web_api_url", "", "");
-    INSERT("yuzu_username", "", "");
-    INSERT("yuzu_token", "Token:", "");
 
 #undef INSERT
 
@@ -241,6 +156,49 @@ std::forward_list<QString> ComboboxEnumeration(std::type_index type, QWidget* pa
             tr("High"),
             tr("Extreme"),
         };
+    } else if (type == typeid(Settings::CPUAccuracy)) {
+        return {
+            tr("Auto"),
+            tr("Accurate"),
+            tr("Unsafe"),
+            tr("Paranoid (disables most optimizations)"),
+        };
+    } else if (type == typeid(Settings::FullscreenMode)) {
+        return {
+            tr("Borderless Windowed"),
+            tr("Exclusive Fullscreen"),
+        };
+    } else if (type == typeid(Settings::NvdecEmulation)) {
+        return {
+            tr("No Video Output"),
+            tr("CPU Video Decoding"),
+            tr("GPU Video Decoding (Default)"),
+        };
+    } else if (type == typeid(Settings::ResolutionSetup)) {
+        return {
+            tr("0.5X (360p/540p) [EXPERIMENTAL]"),
+            tr("0.75X (540p/810p) [EXPERIMENTAL]"),
+            tr("1X (720p/1080p)"),
+            tr("1.5X (1080p/1620p) [EXPERIMENTAL]"),
+            tr("2X (1440p/2160p)"),
+            tr("3X (2160p/3240p)"),
+            tr("4X (2880p/4320p)"),
+            tr("5X (3600p/5400p)"),
+            tr("6X (4320p/6480p)"),
+            tr("7X (5040p/7560p)"),
+            tr("8X (5760p/8640p)"),
+        };
+    } else if (type == typeid(Settings::ScalingFilter)) {
+        return {
+            tr("Nearest Neighbor"), tr("Bilinear"),   tr("Bicubic"),
+            tr("Gaussian"),         tr("ScaleForce"), tr("AMD FidelityFX™️ Super Resolution"),
+        };
+    } else if (type == typeid(Settings::AntiAliasing)) {
+        return {
+            tr("None"),
+            tr("FXAA"),
+            tr("SMAA"),
+        };
     } else if (type == typeid(Settings::AnisotropyMode)) {
         return {
             tr("Automatic"), tr("Default"), tr("2x"), tr("4x"), tr("8x"), tr("16x"),
diff --git a/src/yuzu/configuration/shared_translation.h b/src/yuzu/configuration/shared_translation.h
index 79cd08a6a..fcf638ea5 100644
--- a/src/yuzu/configuration/shared_translation.h
+++ b/src/yuzu/configuration/shared_translation.h
@@ -12,7 +12,7 @@
 class QWidget;
 
 namespace ConfigurationShared {
-using TranslationMap = std::map<std::string, std::pair<QString, QString>>;
+using TranslationMap = std::map<u32, std::pair<QString, QString>>;
 
 std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent);
 
-- 
cgit v1.2.3


From a4de202cbd5abdf46c48663874e34bdd028b6df5 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 7 May 2023 17:41:30 -0400
Subject: settings: Add anisotropy mode enum

---
 src/common/settings.h                         | 8 ++++++++
 src/yuzu/configuration/shared_translation.cpp | 7 +++++++
 2 files changed, 15 insertions(+)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index a90fc87a7..1c26081c9 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -116,6 +116,14 @@ enum class AstcRecompression : u32 {
     Bc3 = 2,
 };
 
+enum class AspectRatio : u32 {
+    R16_9,
+    R4_3,
+    R21_9,
+    R16_10,
+    Stretch,
+};
+
 enum class Category : u32 {
     Audio,
     Core,
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 181dd7cf0..c20a3ebd9 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -132,6 +132,8 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
 std::forward_list<QString> ComboboxEnumeration(std::type_index type, QWidget* parent) {
     const auto& tr = [&](const char* text) { return parent->tr(text); };
 
+    // Intentionally skipping VSyncMode to let the UI fill that one out
+
     if (type == typeid(Settings::AstcDecodeMode)) {
         return {
             tr("CPU"),
@@ -199,6 +201,11 @@ std::forward_list<QString> ComboboxEnumeration(std::type_index type, QWidget* pa
             tr("FXAA"),
             tr("SMAA"),
         };
+    } else if (type == typeid(Settings::AspectRatio)) {
+        return {
+            tr("Default (16:9)"), tr("Force 4:3"),         tr("Force 21:9"),
+            tr("Force 16:10"),    tr("Stretch to Window"),
+        };
     } else if (type == typeid(Settings::AnisotropyMode)) {
         return {
             tr("Automatic"), tr("Default"), tr("2x"), tr("4x"), tr("8x"), tr("16x"),
-- 
cgit v1.2.3


From 3a7a5edceaec30b0c34c492724068a8dc20eb181 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 8 May 2023 10:03:40 -0400
Subject: settings: Define base renderer runtime modifiable settings

---
 src/common/settings.h                         | 43 ++++++++++++++-------------
 src/yuzu/configuration/configuration_shared.h |  9 +++---
 2 files changed, 27 insertions(+), 25 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 1c26081c9..2879237cc 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -701,32 +701,33 @@ struct Values {
     ResolutionScalingInfo resolution_info{};
     SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
                                                         "resolution_setup", Category::Renderer};
-    SwitchableSetting<ScalingFilter> scaling_filter{linkage, ScalingFilter::Bilinear,
-                                                    "scaling_filter", Category::Renderer};
-    SwitchableSetting<int, true> fsr_sharpening_slider{
+    SwitchableSetting<ScalingFilter, false, true, true> scaling_filter{
+        linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer};
+    SwitchableSetting<int, true, true, true> fsr_sharpening_slider{
         linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer};
-    SwitchableSetting<AntiAliasing> anti_aliasing{linkage, AntiAliasing::None, "anti_aliasing",
-                                                  Category::Renderer};
+    SwitchableSetting<AntiAliasing, false, true, true> anti_aliasing{
+        linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer};
     // *nix platforms may have issues with the borderless windowed fullscreen mode.
     // Default to exclusive fullscreen on these platforms for now.
-    SwitchableSetting<FullscreenMode, true> fullscreen_mode{linkage,
+    SwitchableSetting<FullscreenMode, true, true, true> fullscreen_mode{linkage,
 #ifdef _WIN32
-                                                            FullscreenMode::Borderless,
+                                                                        FullscreenMode::Borderless,
 #else
-                                                            FullscreenMode::Exclusive,
+                                                                        FullscreenMode::Exclusive,
 #endif
-                                                            FullscreenMode::Borderless,
-                                                            FullscreenMode::Exclusive,
-                                                            "fullscreen_mode",
-                                                            Category::Renderer};
-    SwitchableSetting<int, true> aspect_ratio{linkage, 0, 0, 4, "aspect_ratio", Category::Renderer};
+                                                                        FullscreenMode::Borderless,
+                                                                        FullscreenMode::Exclusive,
+                                                                        "fullscreen_mode",
+                                                                        Category::Renderer};
+    SwitchableSetting<int, true, true, true> aspect_ratio{
+        linkage, 0, 0, 4, "aspect_ratio", Category::Renderer};
     SwitchableSetting<AnisotropyMode, true> max_anisotropy{
         linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
         "max_anisotropy", Category::RendererAdvanced};
-    SwitchableSetting<bool, false, false> use_speed_limit{linkage, true, "use_speed_limit",
-                                                          Category::Renderer};
-    SwitchableSetting<u16, true> speed_limit{linkage, 100,           0,
-                                             9999,    "speed_limit", Category::Renderer};
+    SwitchableSetting<bool, false, false, true> use_speed_limit{linkage, true, "use_speed_limit",
+                                                                Category::Renderer};
+    SwitchableSetting<u16, true, true, true> speed_limit{
+        linkage, 100, 0, 9999, "speed_limit", Category::Renderer};
     SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
                                                   Category::Renderer};
     SwitchableSetting<GPUAccuracy, true, true, true> gpu_accuracy{
@@ -742,7 +743,7 @@ struct Values {
                                                             AstcDecodeMode::CPUAsynchronous,
                                                             "accelerate_astc",
                                                             Category::Renderer};
-    Setting<VSyncMode, true> vsync_mode{
+    Setting<VSyncMode, true, true, true> vsync_mode{
         linkage,     VSyncMode::FIFO,   VSyncMode::Immediate, VSyncMode::FIFORelaxed,
         "use_vsync", Category::Renderer};
     SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
@@ -769,9 +770,9 @@ struct Values {
     SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops",
                                                    Category::RendererAdvanced};
 
-    SwitchableSetting<u8> bg_red{linkage, 0, "bg_red", Category::Renderer};
-    SwitchableSetting<u8> bg_green{linkage, 0, "bg_green", Category::Renderer};
-    SwitchableSetting<u8> bg_blue{linkage, 0, "bg_blue", Category::Renderer};
+    SwitchableSetting<u8, false, true, true> bg_red{linkage, 0, "bg_red", Category::Renderer};
+    SwitchableSetting<u8, false, true, true> bg_green{linkage, 0, "bg_green", Category::Renderer};
+    SwitchableSetting<u8, false, true, true> bg_blue{linkage, 0, "bg_blue", Category::Renderer};
 
     // System
     SwitchableSetting<bool> rng_seed_enabled{linkage, false, "rng_seed_enabled", Category::System};
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index d0fe6ea38..d70828935 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -92,10 +92,11 @@ void SetPerGameSetting(QComboBox* combobox,
 void SetHighlight(QWidget* widget, bool highlighted);
 
 // Sets up a QCheckBox like a tristate one, given a Setting
-template <bool ranged, bool save>
-void SetColoredTristate(QCheckBox* checkbox,
-                        const Settings::SwitchableSetting<bool, ranged, save>& setting,
-                        CheckState& tracker) {
+template <bool ranged, bool save, bool runtime_modifiable>
+void SetColoredTristate(
+    QCheckBox* checkbox,
+    const Settings::SwitchableSetting<bool, ranged, save, runtime_modifiable>& setting,
+    CheckState& tracker) {
     if (setting.UsingGlobal()) {
         tracker = CheckState::Global;
     } else {
-- 
cgit v1.2.3


From d35577d3ed0bfc56ddf85a2e8b163d9d02bec809 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 8 May 2023 17:33:10 -0400
Subject: configuration: Implement slider

---
 src/common/settings.h                              |  13 +-
 src/yuzu/configuration/configuration_shared.cpp    | 203 ++++++++++++++++-----
 src/yuzu/configuration/configuration_shared.h      |   6 +-
 src/yuzu/configuration/configure_graphics.cpp      |  31 ++--
 src/yuzu/configuration/configure_graphics.h        |   2 -
 .../configuration/configure_graphics_advanced.cpp  |   2 +-
 .../configuration/configure_graphics_advanced.h    |   2 -
 7 files changed, 188 insertions(+), 71 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 2879237cc..4ca8299b3 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -200,6 +200,8 @@ public:
     virtual bool RuntimeModfiable() const = 0;
     virtual void SetGlobal(bool global) {}
     virtual constexpr u32 Id() const = 0;
+    virtual std::string MinVal() const = 0;
+    virtual std::string MaxVal() const = 0;
     virtual bool UsingGlobal() const {
         return false;
     }
@@ -336,7 +338,7 @@ protected:
         if constexpr (std::is_same<Type, std::string>()) {
             return value_;
         } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
-            return value_.has_value() ? std::to_string(*value_) : "0";
+            return value_.has_value() ? std::to_string(*value_) : "none";
         } else if constexpr (std::is_same<Type, bool>()) {
             return value_ ? "true" : "false";
         } else {
@@ -401,7 +403,7 @@ public:
             if constexpr (std::is_same<Type, std::string>()) {
                 this->SetValue(input);
             } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
-                this->SetValue(static_cast<u32>(std::stoll(input)));
+                this->SetValue(static_cast<u32>(std::stoul(input)));
             } else if constexpr (std::is_same<Type, bool>()) {
                 this->SetValue(input == "true");
             } else {
@@ -435,6 +437,13 @@ public:
         return id;
     }
 
+    virtual std::string MinVal() const override {
+        return this->ToString(minimum);
+    }
+    virtual std::string MaxVal() const override {
+        return this->ToString(maximum);
+    }
+
 protected:
     Type value{};                 ///< The setting
     const Type default_value{};   ///< The default value
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 45165c2e9..076d9cc0d 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -13,10 +13,14 @@
 #include <QStyle>
 #include <QWidget>
 #include <qabstractbutton.h>
+#include <qabstractslider.h>
+#include <qboxlayout.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qnamespace.h>
+#include <qsize.h>
 #include <qsizepolicy.h>
+#include <qsurfaceformat.h>
 #include "common/settings.h"
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_per_game.h"
@@ -24,7 +28,7 @@
 
 namespace ConfigurationShared {
 
-static QPushButton* CreateClearGlobalButton(QWidget* parent, Settings::BasicSetting* setting) {
+static QPushButton* CreateRestoreGlobalButton(QWidget* parent, Settings::BasicSetting* setting) {
     QStyle* style = parent->style();
     QIcon* icon = new QIcon(style->standardIcon(QStyle::SP_DialogResetButton));
     QPushButton* button = new QPushButton(*icon, QStringLiteral(""), parent);
@@ -40,10 +44,8 @@ static QPushButton* CreateClearGlobalButton(QWidget* parent, Settings::BasicSett
     return button;
 }
 
-static std::pair<QWidget*, std::function<void()>> CreateCheckBox(Settings::BasicSetting* setting,
-                                                                 const QString& label,
-                                                                 QWidget* parent,
-                                                                 std::list<CheckState>& trackers) {
+static std::tuple<QWidget*, void*, QPushButton*, std::function<void()>> CreateCheckBox(
+    Settings::BasicSetting* setting, const QString& label, QWidget* parent) {
     QWidget* widget = new QWidget(parent);
     QHBoxLayout* layout = new QHBoxLayout(widget);
 
@@ -54,13 +56,15 @@ static std::pair<QWidget*, std::function<void()>> CreateCheckBox(Settings::Basic
 
     std::function<void()> load_func;
 
+    QPushButton* button{nullptr};
+
     layout->addWidget(checkbox);
     if (Settings::IsConfiguringGlobal()) {
         load_func = [setting, checkbox]() {
             setting->LoadString(checkbox->checkState() == Qt::Checked ? "true" : "false");
         };
     } else {
-        auto* button = CreateClearGlobalButton(parent, setting);
+        button = CreateRestoreGlobalButton(parent, setting);
         layout->addWidget(button);
 
         QObject::connect(checkbox, &QCheckBox::stateChanged, [button](int) {
@@ -86,7 +90,7 @@ static std::pair<QWidget*, std::function<void()>> CreateCheckBox(Settings::Basic
 
     layout->setContentsMargins(0, 0, 0, 0);
 
-    return {widget, load_func};
+    return {widget, checkbox, button, load_func};
 }
 
 static std::tuple<QWidget*, QComboBox*, QPushButton*, std::function<void()>> CreateCombobox(
@@ -122,7 +126,7 @@ static std::tuple<QWidget*, QComboBox*, QPushButton*, std::function<void()>> Cre
             setting->LoadString(std::to_string(combobox->currentIndex()));
         };
     } else if (managed) {
-        button = CreateClearGlobalButton(parent, setting);
+        button = CreateRestoreGlobalButton(parent, setting);
         layout->addWidget(button);
 
         QObject::connect(button, &QAbstractButton::clicked, [button, combobox, setting](bool) {
@@ -149,8 +153,8 @@ static std::tuple<QWidget*, QComboBox*, QPushButton*, std::function<void()>> Cre
     return {group, combobox, button, load_func};
 }
 
-static std::tuple<QWidget*, void*, std::function<void()>> CreateLineEdit(
-    Settings::BasicSetting* setting, const QString& label, QWidget* parent) {
+static std::tuple<QWidget*, void*, QPushButton*, std::function<void()>> CreateLineEdit(
+    Settings::BasicSetting* setting, const QString& label, QWidget* parent, bool managed = true) {
     QWidget* widget = new QWidget(parent);
     widget->setObjectName(label);
 
@@ -160,58 +164,140 @@ static std::tuple<QWidget*, void*, std::function<void()>> CreateLineEdit(
     const QString text = QString::fromStdString(setting->ToString());
     line_edit->setText(text);
 
-    std::function<void()> load_func;
+    std::function<void()> load_func = []() {};
 
+    QLabel* q_label = new QLabel(label, widget);
     // setSizePolicy lets widget expand and take an equal part of the space as the line edit
-    if (Settings::IsConfiguringGlobal()) {
-        QLabel* q_label = new QLabel(label, widget);
-        q_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-        layout->addWidget(q_label);
+    q_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    layout->addWidget(q_label);
+
+    layout->addWidget(line_edit);
 
+    QPushButton* button{nullptr};
+
+    if (Settings::IsConfiguringGlobal() && !managed) {
         load_func = [line_edit, setting]() {
             std::string load_text = line_edit->text().toStdString();
             setting->LoadString(load_text);
         };
-    } else {
-        QCheckBox* checkbox = new QCheckBox(label, parent);
-        checkbox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-        layout->addWidget(checkbox);
-
-        const auto highlight_func = [widget, line_edit](int state) {
-            bool using_global = state != Qt::Checked;
-            SetHighlight(widget, !using_global);
-            line_edit->setEnabled(!using_global);
-        };
+    } else if (!managed) {
+        button = CreateRestoreGlobalButton(parent, setting);
+        layout->addWidget(button);
 
-        QObject::connect(checkbox, qOverload<int>(&QCheckBox::stateChanged), widget,
-                         highlight_func);
+        QObject::connect(button, &QAbstractButton::clicked, [=](bool) {
+            button->setEnabled(false);
+            button->setVisible(false);
 
-        checkbox->setCheckState(setting->UsingGlobal() ? Qt::Unchecked : Qt::Checked);
-        highlight_func(checkbox->checkState());
+            line_edit->setText(QString::fromStdString(setting->ToStringGlobal()));
+        });
 
-        load_func = [checkbox, setting, line_edit]() {
-            if (checkbox->checkState() == Qt::Checked) {
-                setting->SetGlobal(false);
+        QObject::connect(line_edit, &QLineEdit::textChanged, [=](QString) {
+            button->setEnabled(true);
+            button->setVisible(true);
+        });
 
-                std::string load_text = line_edit->text().toStdString();
-                setting->LoadString(load_text);
-            } else {
-                setting->SetGlobal(true);
+        load_func = [=]() {
+            bool using_global = !button->isEnabled();
+            setting->SetGlobal(using_global);
+            if (!using_global) {
+                setting->LoadString(line_edit->text().toStdString());
             }
         };
     }
 
-    layout->addWidget(line_edit);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    return {widget, line_edit, button, load_func};
+}
+
+static std::tuple<QWidget*, void*, QPushButton*, std::function<void()>> CreateSlider(
+    Settings::BasicSetting* setting, const QString& name, QWidget* parent, bool reversed,
+    float multiplier) {
+    QWidget* widget = new QWidget(parent);
+    QHBoxLayout* layout = new QHBoxLayout(widget);
+    QSlider* slider = new QSlider(Qt::Horizontal, widget);
+    QLabel* label = new QLabel(name, widget);
+    QPushButton* button{nullptr};
+    QLabel* feedback = new QLabel(widget);
+
+    layout->addWidget(label);
+    layout->addWidget(slider);
+    layout->addWidget(feedback);
+
+    label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
     layout->setContentsMargins(0, 0, 0, 0);
 
-    return {widget, line_edit, load_func};
+    int max_val = std::stoi(setting->MaxVal());
+
+    QObject::connect(slider, &QAbstractSlider::valueChanged, [=](int value) {
+        int present = (reversed ? max_val - value : value) * multiplier;
+        feedback->setText(
+            QStringLiteral("%1%").arg(QString::fromStdString(std::to_string(present))));
+    });
+
+    slider->setValue(std::stoi(setting->ToString()));
+    slider->setMinimum(std::stoi(setting->MinVal()));
+    slider->setMaximum(max_val);
+
+    if (reversed) {
+        slider->setInvertedAppearance(true);
+    }
+
+    std::function<void()> load_func;
+
+    if (Settings::IsConfiguringGlobal()) {
+        load_func = [=]() { setting->LoadString(std::to_string(slider->value())); };
+    } else {
+        button = CreateRestoreGlobalButton(parent, setting);
+        layout->addWidget(button);
+
+        QObject::connect(button, &QAbstractButton::clicked, [=](bool) {
+            slider->setValue(std::stoi(setting->ToStringGlobal()));
+
+            button->setEnabled(false);
+            button->setVisible(false);
+        });
+
+        QObject::connect(slider, &QAbstractSlider::sliderMoved, [=](int) {
+            button->setEnabled(true);
+            button->setVisible(true);
+        });
+
+        load_func = [=]() {
+            bool using_global = !button->isEnabled();
+            setting->SetGlobal(using_global);
+            if (!using_global) {
+                setting->LoadString(std::to_string(slider->value()));
+            }
+        };
+    }
+
+    return {widget, slider, button, []() {}};
+}
+
+static std::tuple<QWidget*, void*, void*, QPushButton*, std::function<void()>>
+CreateCheckBoxWithLineEdit(Settings::BasicSetting* setting, const QString& label, QWidget* parent) {
+    auto tuple = CreateCheckBox(setting, label, parent);
+    auto* widget = std::get<0>(tuple);
+    auto* checkbox = std::get<1>(tuple);
+    auto* button = std::get<2>(tuple);
+    auto load_func = std::get<3>(tuple);
+    QHBoxLayout* layout = dynamic_cast<QHBoxLayout*>(widget->layout());
+
+    auto line_edit_tuple = CreateLineEdit(setting, label, parent, false);
+    auto* line_edit_widget = std::get<0>(line_edit_tuple);
+    auto* line_edit = std::get<1>(line_edit_tuple);
+
+    layout->insertWidget(1, line_edit_widget);
+
+    return {widget, checkbox, line_edit, button, load_func};
 }
 
 std::tuple<QWidget*, void*, QPushButton*> CreateWidget(
     Settings::BasicSetting* setting, const TranslationMap& translations, QWidget* parent,
     bool runtime_lock, std::forward_list<std::function<void(bool)>>& apply_funcs,
-    std::list<CheckState>& trackers, RequestType request, bool managed) {
+    RequestType request, bool managed, float multiplier, const std::string& text_box_default) {
     if (!Settings::IsConfiguringGlobal() && !setting->Switchable()) {
         LOG_DEBUG(Frontend, "\"{}\" is not switchable, skipping...", setting->GetLabel());
         return {nullptr, nullptr, nullptr};
@@ -242,9 +328,27 @@ std::tuple<QWidget*, void*, QPushButton*> CreateWidget(
     QPushButton* button;
 
     if (type == typeid(bool)) {
-        auto pair = CreateCheckBox(setting, label, parent, trackers);
-        widget = pair.first;
-        load_func = pair.second;
+        switch (request) {
+        case RequestType::Default: {
+            auto tuple = CreateCheckBox(setting, label, parent);
+            widget = std::get<0>(tuple);
+            extra = std::get<1>(tuple);
+            button = std::get<2>(tuple);
+            load_func = std::get<3>(tuple);
+            break;
+        }
+        case RequestType::LineEdit: {
+            auto tuple = CreateCheckBoxWithLineEdit(setting, label, parent);
+            widget = std::get<0>(tuple);
+            break;
+        }
+        case RequestType::ComboBox:
+        case RequestType::SpinBox:
+        case RequestType::Slider:
+        case RequestType::ReverseSlider:
+        case RequestType::MaxEnum:
+            break;
+        }
     } else if (setting->IsEnum()) {
         auto tuple = CreateCombobox(setting, label, parent, managed);
         widget = std::get<0>(tuple);
@@ -253,11 +357,13 @@ std::tuple<QWidget*, void*, QPushButton*> CreateWidget(
         load_func = std::get<3>(tuple);
     } else if (type == typeid(u32) || type == typeid(int)) {
         switch (request) {
+        case RequestType::LineEdit:
         case RequestType::Default: {
             auto tuple = CreateLineEdit(setting, label, parent);
             widget = std::get<0>(tuple);
             extra = std::get<1>(tuple);
-            load_func = std::get<2>(tuple);
+            button = std::get<2>(tuple);
+            load_func = std::get<3>(tuple);
             break;
         }
         case RequestType::ComboBox: {
@@ -268,8 +374,17 @@ std::tuple<QWidget*, void*, QPushButton*> CreateWidget(
             load_func = std::get<3>(tuple);
             break;
         }
-        case RequestType::SpinBox:
         case RequestType::Slider:
+        case RequestType::ReverseSlider: {
+            auto tuple = CreateSlider(setting, label, parent, request == RequestType::ReverseSlider,
+                                      multiplier);
+            widget = std::get<0>(tuple);
+            extra = std::get<1>(tuple);
+            button = std::get<2>(tuple);
+            load_func = std::get<3>(tuple);
+            break;
+        }
+        case RequestType::SpinBox:
         case RequestType::MaxEnum:
             break;
         }
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 63df11d26..ef3b7c9a9 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -48,14 +48,16 @@ enum class RequestType {
     ComboBox,
     SpinBox,
     Slider,
+    ReverseSlider,
+    LineEdit,
     MaxEnum,
 };
 
 std::tuple<QWidget*, void*, QPushButton*> CreateWidget(
     Settings::BasicSetting* setting, const TranslationMap& translations, QWidget* parent,
     bool runtime_lock, std::forward_list<std::function<void(bool)>>& apply_funcs,
-    std::list<CheckState>& trackers, RequestType request = RequestType::Default,
-    bool managed = true);
+    RequestType request = RequestType::Default, bool managed = true, float multiplier = 1.0f,
+    const std::string& text_box_default = "");
 
 // Global-aware apply and set functions
 
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 1145b6c43..d3ca7e8cc 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -97,7 +97,6 @@ ConfigureGraphics::ConfigureGraphics(
                                                 Settings::values.bg_blue.GetValue()));
     UpdateAPILayout();
     PopulateVSyncModeSelection(); //< must happen after UpdateAPILayout
-    // SetFSRIndicatorText(ui->fsr_sharpening_slider->sliderPosition());
 
     // VSync setting needs to be determined after populating the VSync combobox
     if (Settings::IsConfiguringGlobal()) {
@@ -134,18 +133,13 @@ ConfigureGraphics::ConfigureGraphics(
     //     }
     //     UpdateBackgroundColorButton(new_bg_color);
     // });
+    // ui->bg_label->setVisible(Settings::IsConfiguringGlobal());
+    // ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal());
 
     api_combobox->setEnabled(!UISettings::values.has_broken_vulkan && api_combobox->isEnabled());
     ui->api_widget->setEnabled(
         (!UISettings::values.has_broken_vulkan || Settings::IsConfiguringGlobal()) &&
         ui->api_widget->isEnabled());
-    // ui->bg_label->setVisible(Settings::IsConfiguringGlobal());
-    // ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal());
-
-    // connect(ui->fsr_sharpening_slider, &QSlider::valueChanged, this,
-    //         &ConfigureGraphics::SetFSRIndicatorText);
-    // ui->fsr_sharpening_combobox->setVisible(!Settings::IsConfiguringGlobal());
-    // ui->fsr_sharpening_label->setVisible(Settings::IsConfiguringGlobal());
 }
 
 void ConfigureGraphics::PopulateVSyncModeSelection() {
@@ -230,11 +224,19 @@ void ConfigureGraphics::SetConfiguration() {
                 setting->Id() == Settings::values.shader_backend.Id() ||
                 setting->Id() == Settings::values.vsync_mode.Id()) {
                 return ConfigurationShared::CreateWidget(
-                    setting, translations, this, runtime_lock, apply_funcs, trackers,
+                    setting, translations, this, runtime_lock, apply_funcs,
                     ConfigurationShared::RequestType::ComboBox, false);
+            } else if (setting->Id() == Settings::values.fsr_sharpening_slider.Id()) {
+                return ConfigurationShared::CreateWidget(
+                    setting, translations, this, runtime_lock, apply_funcs,
+                    ConfigurationShared::RequestType::ReverseSlider, true, 0.5f);
+            } else if (setting->Id() == Settings::values.use_speed_limit.Id()) {
+                return ConfigurationShared::CreateWidget(
+                    setting, translations, this, runtime_lock, apply_funcs,
+                    ConfigurationShared::RequestType::LineEdit, true, 1.0f, setting->ToString());
             } else {
                 return ConfigurationShared::CreateWidget(setting, translations, this, runtime_lock,
-                                                         apply_funcs, trackers);
+                                                         apply_funcs);
             }
         }();
 
@@ -251,12 +253,10 @@ void ConfigureGraphics::SetConfiguration() {
                 QObject::connect(api_restore_global_button, &QAbstractButton::clicked,
                                  [=](bool) { UpdateAPILayout(); });
 
+                // Detach API's restore button and place it where we want
                 widget->layout()->removeWidget(api_restore_global_button);
                 api_layout->addWidget(api_restore_global_button);
             }
-        } else if (setting->Id() == Settings::values.vulkan_device.Id()) {
-            api_layout->addWidget(widget);
-            api_combobox = reinterpret_cast<QComboBox*>(extra);
         } else if (setting->Id() == Settings::values.vulkan_device.Id()) {
             hold_api.push_front(widget);
             vulkan_device_combobox = reinterpret_cast<QComboBox*>(extra);
@@ -284,11 +284,6 @@ void ConfigureGraphics::SetConfiguration() {
     }
 }
 
-void ConfigureGraphics::SetFSRIndicatorText(int percentage) {
-    // ui->fsr_sharpening_value->setText(
-    //     tr("%1%", "FSR sharpening percentage (e.g. 50%)").arg(100 - (percentage / 2)));
-}
-
 const QString ConfigureGraphics::TranslateVSyncMode(VkPresentModeKHR mode,
                                                     Settings::RendererBackend backend) const {
     switch (mode) {
diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h
index 12a588127..a049458a8 100644
--- a/src/yuzu/configuration/configure_graphics.h
+++ b/src/yuzu/configuration/configure_graphics.h
@@ -58,7 +58,6 @@ private:
 
     void RetrieveVulkanDevices();
 
-    void SetFSRIndicatorText(int percentage);
     /* Turns a Vulkan present mode into a textual string for a UI
      * (and eventually for a human to read) */
     const QString TranslateVSyncMode(VkPresentModeKHR mode,
@@ -69,7 +68,6 @@ private:
     std::unique_ptr<Ui::ConfigureGraphics> ui;
     QColor bg_color;
 
-    std::list<ConfigurationShared::CheckState> trackers{};
     std::forward_list<std::function<void(bool)>> apply_funcs{};
 
     std::vector<VkDeviceInfo::Record>& records;
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 8a53ad111..4a3868693 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -33,7 +33,7 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {
     for (auto setting :
          Settings::values.linkage.by_category[Settings::Category::RendererAdvanced]) {
         auto [widget, extra, button] = ConfigurationShared::CreateWidget(
-            setting, translations, this, runtime_lock, apply_funcs, trackers);
+            setting, translations, this, runtime_lock, apply_funcs);
 
         if (widget == nullptr) {
             continue;
diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h
index 3ac6b4bce..327134ee6 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.h
+++ b/src/yuzu/configuration/configure_graphics_advanced.h
@@ -34,8 +34,6 @@ private:
 
     std::unique_ptr<Ui::ConfigureGraphicsAdvanced> ui;
 
-    std::list<ConfigurationShared::CheckState> trackers{};
-
     const Core::System& system;
     const ConfigurationShared::TranslationMap& translations;
     std::forward_list<std::function<void(bool)>> apply_funcs;
-- 
cgit v1.2.3


From 464aad52cd644bdc32ca4eb35b0ce669c3b30c4f Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 9 May 2023 01:35:25 -0400
Subject: settings: Add UiGeneral class

---
 src/common/settings.cpp           |  4 ++++
 src/common/settings.h             |  7 +++++--
 src/yuzu/configuration/config.cpp |  1 +
 src/yuzu/uisettings.h             | 11 ++++++-----
 4 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 38a82f6f7..b7a0c063f 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -144,6 +144,9 @@ float Volume() {
     return values.volume.GetValue() / static_cast<f32>(values.volume.GetDefault());
 }
 
+Linkage::Linkage() = default;
+Linkage::~Linkage() = default;
+
 const char* TranslateCategory(Category category) {
     switch (category) {
     case Category::Audio:
@@ -176,6 +179,7 @@ const char* TranslateCategory(Category category) {
     case Category::Controls:
         return "Controls";
     case Category::Ui:
+    case Category::UiGeneral:
         return "UI";
     case Category::UiLayout:
         return "UiLayout";
diff --git a/src/common/settings.h b/src/common/settings.h
index 4ca8299b3..e60105059 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -143,6 +143,7 @@ enum class Category : u32 {
     AddOns,
     Controls,
     Ui,
+    UiGeneral,
     UiLayout,
     UiGameList,
     Screenshots,
@@ -209,8 +210,10 @@ public:
 
 class Linkage {
 public:
-    std::map<Category, std::forward_list<BasicSetting*>> by_category;
-    std::vector<std::function<void()>> restore_functions;
+    explicit Linkage();
+    ~Linkage();
+    std::map<Category, std::forward_list<BasicSetting*>> by_category{};
+    std::vector<std::function<void()>> restore_functions{};
     u32 count;
 };
 
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 28c606f5e..3181a9528 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -717,6 +717,7 @@ void Config::ReadUIValues() {
     ReadMultiplayerValues();
 
     ReadCategory(Settings::Category::Ui);
+    ReadCategory(Settings::Category::UiGeneral);
 
     qt_config->endGroup();
 }
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 53cdd7fcb..9e2cea4d6 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -78,17 +78,18 @@ struct Values {
     Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};
     Setting<bool> show_status_bar{linkage, true, "showStatusBar", Category::Ui};
 
-    Setting<bool> confirm_before_closing{linkage, true, "confirmClose", Category::Ui};
+    Setting<bool> confirm_before_closing{linkage, true, "confirmClose", Category::UiGeneral};
     Setting<bool> first_start{linkage, true, "firstStart", Category::Ui};
-    Setting<bool> pause_when_in_background{linkage, false, "pauseWhenInBackground", Category::Ui};
+    Setting<bool> pause_when_in_background{linkage, false, "pauseWhenInBackground",
+                                           Category::UiGeneral};
     Setting<bool> mute_when_in_background{linkage, false, "muteWhenInBackground", Category::Ui};
-    Setting<bool> hide_mouse{linkage, true, "hideInactiveMouse", Category::Ui};
+    Setting<bool> hide_mouse{linkage, true, "hideInactiveMouse", Category::UiGeneral};
     Setting<bool> controller_applet_disabled{linkage, false, "disableControllerApplet",
-                                             Category::Ui};
+                                             Category::UiGeneral};
     // Set when Vulkan is known to crash the application
     bool has_broken_vulkan = false;
 
-    Setting<bool> select_user_on_boot{linkage, false, "select_user_on_boot", Category::Ui};
+    Setting<bool> select_user_on_boot{linkage, false, "select_user_on_boot", Category::UiGeneral};
     Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Ui};
 
     // Discord RPC
-- 
cgit v1.2.3


From cdb5dea26959001f9cf7448fcdb612475045a313 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 9 May 2023 16:21:24 -0400
Subject: settings: Move runtime and save to parameters

These don't need to be whole new types.
---
 src/common/settings.h                         | 148 +++++++++++++++-----------
 src/yuzu/configuration/configuration_shared.h |   9 +-
 2 files changed, 89 insertions(+), 68 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index e60105059..fdadb06a1 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -222,7 +222,7 @@ public:
  * configurations. Specifying a default value and label is required. A minimum and maximum range
  * can be specified for sanitization.
  */
-template <typename Type, bool ranged = false, bool save = true, bool runtime_modifiable = false>
+template <typename Type, bool ranged = false>
 class Setting : public BasicSetting {
 protected:
     Setting() = default;
@@ -245,10 +245,10 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
-                     enum Category category_)
+                     enum Category category_, bool save_ = true, bool runtime_modifiable_ = false)
         requires(!ranged)
-        : value{default_val},
-          default_value{default_val}, label{name}, category{category_}, id{linkage.count} {
+        : value{default_val}, default_value{default_val}, label{name}, category{category_},
+          id{linkage.count}, save{save_}, runtime_modifiable{runtime_modifiable_} {
         linkage.by_category[category].push_front(this);
         linkage.count++;
     }
@@ -265,10 +265,12 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
-                     const Type& max_val, const std::string& name, enum Category category_)
+                     const Type& max_val, const std::string& name, enum Category category_,
+                     bool save_ = true, bool runtime_modifiable_ = false)
         requires(ranged)
         : value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val},
-          label{name}, category{category_}, id{linkage.count} {
+          label{name}, category{category_}, id{linkage.count}, save{save_},
+          runtime_modifiable{runtime_modifiable_} {
         linkage.by_category[category].push_front(this);
         linkage.count++;
     }
@@ -455,6 +457,8 @@ protected:
     const std::string label{};    ///< The setting's label
     const enum Category category; ///< The setting's category AKA INI group
     const u32 id;
+    bool save;
+    bool runtime_modifiable;
 };
 
 /**
@@ -465,8 +469,8 @@ protected:
  *
  * By default, the global setting is used.
  */
-template <typename Type, bool ranged = false, bool save = true, bool runtime_modifiable = false>
-class SwitchableSetting : virtual public Setting<Type, ranged, save, runtime_modifiable> {
+template <typename Type, bool ranged = false>
+class SwitchableSetting : virtual public Setting<Type, ranged> {
 public:
     /**
      * Sets a default value, label, and setting value.
@@ -477,9 +481,9 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
-                               Category category)
+                               Category category, bool save = true, bool runtime_modifiable = false)
         requires(!ranged)
-        : Setting<Type, false, save, runtime_modifiable>{linkage, default_val, name, category} {
+        : Setting<Type, false>{linkage, default_val, name, category, save, runtime_modifiable} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
     virtual ~SwitchableSetting() = default;
@@ -495,10 +499,11 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
-                               const Type& max_val, const std::string& name, Category category)
+                               const Type& max_val, const std::string& name, Category category,
+                               bool save = true, bool runtime_modifiable = false)
         requires(ranged)
-        : Setting<Type, true, save, runtime_modifiable>{linkage, default_val, min_val,
-                                                        max_val, name,        category} {
+        : Setting<Type, true>{linkage, default_val, min_val, max_val,
+                              name,    category,    save,    runtime_modifiable} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
 
@@ -642,10 +647,10 @@ struct Values {
     Setting<std::string> sink_id{linkage, "auto", "output_engine", 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<bool, false, false> audio_muted{linkage, false, "audio_muted", Category::Audio};
+    Setting<bool, false> audio_muted{linkage, false, "audio_muted", Category::Audio, false};
     SwitchableSetting<u8, true> volume{linkage, 100, 0, 200, "volume", Category::Audio};
-    Setting<bool, false, 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};
 
     // Core
     SwitchableSetting<bool> use_multi_core{linkage, true, "use_multi_core", Category::Core};
@@ -713,38 +718,51 @@ struct Values {
     ResolutionScalingInfo resolution_info{};
     SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
                                                         "resolution_setup", Category::Renderer};
-    SwitchableSetting<ScalingFilter, false, true, true> scaling_filter{
-        linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer};
-    SwitchableSetting<int, true, true, true> fsr_sharpening_slider{
-        linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer};
-    SwitchableSetting<AntiAliasing, false, true, true> anti_aliasing{
-        linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer};
+    SwitchableSetting<ScalingFilter, false> scaling_filter{
+        linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer, true, true};
+    SwitchableSetting<int, true> fsr_sharpening_slider{
+        linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer, true, true};
+    SwitchableSetting<AntiAliasing, false> anti_aliasing{
+        linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer, true, true};
     // *nix platforms may have issues with the borderless windowed fullscreen mode.
     // Default to exclusive fullscreen on these platforms for now.
-    SwitchableSetting<FullscreenMode, true, true, true> fullscreen_mode{linkage,
+    SwitchableSetting<FullscreenMode, true> fullscreen_mode{linkage,
 #ifdef _WIN32
-                                                                        FullscreenMode::Borderless,
+                                                            FullscreenMode::Borderless,
 #else
-                                                                        FullscreenMode::Exclusive,
+                                                            FullscreenMode::Exclusive,
 #endif
-                                                                        FullscreenMode::Borderless,
-                                                                        FullscreenMode::Exclusive,
-                                                                        "fullscreen_mode",
-                                                                        Category::Renderer};
-    SwitchableSetting<int, true, true, true> aspect_ratio{
-        linkage, 0, 0, 4, "aspect_ratio", Category::Renderer};
+                                                            FullscreenMode::Borderless,
+                                                            FullscreenMode::Exclusive,
+                                                            "fullscreen_mode",
+                                                            Category::Renderer,
+                                                            true,
+                                                            true};
+    SwitchableSetting<AspectRatio, true> aspect_ratio{linkage,
+                                                      AspectRatio::R16_9,
+                                                      AspectRatio::R16_9,
+                                                      AspectRatio::Stretch,
+                                                      "aspect_ratio",
+                                                      Category::Renderer,
+                                                      true,
+                                                      true};
     SwitchableSetting<AnisotropyMode, true> max_anisotropy{
         linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
         "max_anisotropy", Category::RendererAdvanced};
-    SwitchableSetting<bool, false, false, true> use_speed_limit{linkage, true, "use_speed_limit",
-                                                                Category::Renderer};
-    SwitchableSetting<u16, true, true, true> speed_limit{
-        linkage, 100, 0, 9999, "speed_limit", Category::Renderer};
+    SwitchableSetting<bool, false> use_speed_limit{
+        linkage, true, "use_speed_limit", Category::Renderer, false, true};
+    SwitchableSetting<u16, true> speed_limit{
+        linkage, 100, 0, 9999, "speed_limit", Category::Renderer, true, true};
     SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
                                                   Category::Renderer};
-    SwitchableSetting<GPUAccuracy, true, true, true> gpu_accuracy{
-        linkage,        GPUAccuracy::High,         GPUAccuracy::Normal, GPUAccuracy::Extreme,
-        "gpu_accuracy", Category::RendererAdvanced};
+    SwitchableSetting<GPUAccuracy, true> gpu_accuracy{linkage,
+                                                      GPUAccuracy::High,
+                                                      GPUAccuracy::Normal,
+                                                      GPUAccuracy::Extreme,
+                                                      "gpu_accuracy",
+                                                      Category::RendererAdvanced,
+                                                      true,
+                                                      true};
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{
         linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
     SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::GPU,
@@ -755,9 +773,14 @@ struct Values {
                                                             AstcDecodeMode::CPUAsynchronous,
                                                             "accelerate_astc",
                                                             Category::Renderer};
-    Setting<VSyncMode, true, true, true> vsync_mode{
-        linkage,     VSyncMode::FIFO,   VSyncMode::Immediate, VSyncMode::FIFORelaxed,
-        "use_vsync", Category::Renderer};
+    Setting<VSyncMode, true> vsync_mode{linkage,
+                                        VSyncMode::FIFO,
+                                        VSyncMode::Immediate,
+                                        VSyncMode::FIFORelaxed,
+                                        "use_vsync",
+                                        Category::Renderer,
+                                        true,
+                                        true};
     SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
                                                   Category::RendererAdvanced};
     SwitchableSetting<ShaderBackend, true> shader_backend{
@@ -765,10 +788,10 @@ struct Values {
         "shader_backend", Category::Renderer};
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::RendererAdvanced};
-    SwitchableSetting<bool, false, true, true> use_fast_gpu_time{linkage, true, "use_fast_gpu_time",
-                                                                 Category::RendererAdvanced};
-    SwitchableSetting<bool, false, true, true> use_vulkan_driver_pipeline_cache{
-        linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced};
+    SwitchableSetting<bool, false> use_fast_gpu_time{
+        linkage, true, "use_fast_gpu_time", Category::RendererAdvanced, true, true};
+    SwitchableSetting<bool, false> use_vulkan_driver_pipeline_cache{
+        linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced, true, true};
     SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
                                                      Category::RendererAdvanced};
     SwitchableSetting<AstcRecompression, true> astc_recompression{linkage,
@@ -782,9 +805,9 @@ struct Values {
     SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops",
                                                    Category::RendererAdvanced};
 
-    SwitchableSetting<u8, false, true, true> bg_red{linkage, 0, "bg_red", Category::Renderer};
-    SwitchableSetting<u8, false, true, true> bg_green{linkage, 0, "bg_green", Category::Renderer};
-    SwitchableSetting<u8, false, true, true> bg_blue{linkage, 0, "bg_blue", Category::Renderer};
+    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};
 
     // System
     SwitchableSetting<bool> rng_seed_enabled{linkage, false, "rng_seed_enabled", Category::System};
@@ -809,15 +832,14 @@ struct Values {
     // Controls
     InputSetting<std::array<PlayerInput, 10>> players;
 
-    Setting<bool, false,
+    Setting<bool, false> enable_raw_input{linkage, false, "enable_raw_input", Category::Controls,
 // Only read/write enable_raw_input on Windows platforms
 #ifdef _WIN32
-            true
+                                          true
 #else
-            false
+                                           false
 #endif
-            >
-        enable_raw_input{linkage, false, "enable_raw_input", Category::Controls};
+    };
     Setting<bool> controller_navigation{linkage, true, "controller_navigation", Category::Controls};
     Setting<bool> enable_joycon_driver{linkage, true, "enable_joycon_driver", Category::Controls};
     Setting<bool> enable_procon_driver{linkage, false, "enable_procon_driver", Category::Controls};
@@ -837,7 +859,7 @@ struct Values {
     Setting<bool> tas_enable{linkage, false, "tas_enable", Category::Controls};
     Setting<bool> tas_loop{linkage, false, "tas_loop", Category::Controls};
 
-    Setting<bool, false, false> mouse_panning{linkage, false, "mouse_panning", Category::Controls};
+    Setting<bool, false> mouse_panning{linkage, false, "mouse_panning", Category::Controls, false};
     Setting<u8, true> mouse_panning_sensitivity{
         linkage, 50, 1, 100, "mouse_panning_sensitivity", Category::Controls};
     Setting<bool> mouse_enabled{linkage, false, "mouse_enabled", Category::Controls};
@@ -893,22 +915,22 @@ struct Values {
     Setting<std::string> program_args{linkage, std::string(), "program_args", Category::Debugging};
     Setting<bool> dump_exefs{linkage, false, "dump_exefs", Category::Debugging};
     Setting<bool> dump_nso{linkage, false, "dump_nso", Category::Debugging};
-    Setting<bool, false, false> dump_shaders{linkage, false, "dump_shaders",
-                                             Category::DebuggingGraphics};
-    Setting<bool, false, false> dump_macros{linkage, false, "dump_macros",
-                                            Category::DebuggingGraphics};
+    Setting<bool, false> dump_shaders{linkage, false, "dump_shaders", Category::DebuggingGraphics,
+                                      false};
+    Setting<bool, false> dump_macros{linkage, false, "dump_macros", Category::DebuggingGraphics,
+                                     false};
     Setting<bool> enable_fs_access_log{linkage, false, "enable_fs_access_log", Category::Debugging};
-    Setting<bool, false, false> reporting_services{linkage, false, "reporting_services",
-                                                   Category::Debugging};
+    Setting<bool, false> reporting_services{linkage, false, "reporting_services",
+                                            Category::Debugging, false};
     Setting<bool> quest_flag{linkage, false, "quest_flag", Category::Debugging};
     Setting<bool> disable_macro_jit{linkage, false, "disable_macro_jit",
                                     Category::DebuggingGraphics};
     Setting<bool> disable_macro_hle{linkage, false, "disable_macro_hle",
                                     Category::DebuggingGraphics};
-    Setting<bool, false, false> extended_logging{linkage, false, "extended_logging",
-                                                 Category::Debugging};
+    Setting<bool, false> extended_logging{linkage, false, "extended_logging", Category::Debugging,
+                                          false};
     Setting<bool> use_debug_asserts{linkage, false, "use_debug_asserts", Category::Debugging};
-    Setting<bool, false, false> use_auto_stub{linkage, false, "use_auto_stub", Category::Debugging};
+    Setting<bool, false> use_auto_stub{linkage, false, "use_auto_stub", Category::Debugging, false};
     Setting<bool> enable_all_controllers{linkage, false, "enable_all_controllers",
                                          Category::Debugging};
     Setting<bool> create_crash_dumps{linkage, false, "create_crash_dumps", Category::Debugging};
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 0a0a92ae5..83a0dd574 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -77,11 +77,10 @@ void SetPerGameSetting(QComboBox* combobox,
 void SetHighlight(QWidget* widget, bool highlighted);
 
 // Sets up a QCheckBox like a tristate one, given a Setting
-template <bool ranged, bool save, bool runtime_modifiable>
-void SetColoredTristate(
-    QCheckBox* checkbox,
-    const Settings::SwitchableSetting<bool, ranged, save, runtime_modifiable>& setting,
-    CheckState& tracker) {
+template <bool ranged>
+void SetColoredTristate(QCheckBox* checkbox,
+                        const Settings::SwitchableSetting<bool, ranged>& setting,
+                        CheckState& tracker) {
     if (setting.UsingGlobal()) {
         tracker = CheckState::Global;
     } else {
-- 
cgit v1.2.3


From 8e151460265f04c7bf4a981b5f97f252a0444c27 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 10 May 2023 17:57:25 -0400
Subject: configure_system: Implement with for loop

---
 src/common/settings.cpp                       |   1 +
 src/common/settings.h                         | 114 +++++-
 src/core/core.cpp                             |  20 +-
 src/core/file_sys/control_metadata.cpp        |   3 +-
 src/core/file_sys/patch_manager.cpp           |   4 +-
 src/core/hle/service/ns/ns.cpp                |   2 +-
 src/core/hle/service/set/set.cpp              |  10 +-
 src/yuzu/configuration/config.cpp             |   2 +
 src/yuzu/configuration/configure_dialog.cpp   |   2 +-
 src/yuzu/configuration/configure_graphics.cpp |   2 +-
 src/yuzu/configuration/configure_per_game.cpp |   2 +-
 src/yuzu/configuration/configure_system.cpp   | 232 +++++-------
 src/yuzu/configuration/configure_system.h     |  17 +-
 src/yuzu/configuration/configure_system.ui    | 509 +++-----------------------
 src/yuzu/configuration/shared_translation.cpp |  43 ++-
 src/yuzu/configuration/shared_widget.cpp      | 179 ++++++++-
 src/yuzu/configuration/shared_widget.h        |  13 +-
 src/yuzu_cmd/config.cpp                       |   1 +
 18 files changed, 508 insertions(+), 648 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index b7a0c063f..605fe7f86 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -162,6 +162,7 @@ const char* TranslateCategory(Category category) {
     case Category::RendererDebug:
         return "Renderer";
     case Category::System:
+    case Category::SystemAudio:
         return "System";
     case Category::DataStorage:
         return "Data Storage";
diff --git a/src/common/settings.h b/src/common/settings.h
index fdadb06a1..1f95bd7d5 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -20,6 +20,86 @@
 
 namespace Settings {
 
+enum class Language : u32 {
+    Japanese,
+    EnglishAmerican,
+    French,
+    German,
+    Italian,
+    Spanish,
+    Chinese,
+    Korean,
+    Dutch,
+    Portuguese,
+    Russian,
+    Taiwanese,
+    EnglishBritish,
+    FrenchCanadian,
+    SpanishLatin,
+    ChineseSimplified,
+    ChineseTraditional,
+    PortugueseBrazilian,
+};
+
+enum class Region : u32 {
+    Japan,
+    USA,
+    Europe,
+    Australia,
+    China,
+    Korea,
+    Taiwan,
+};
+
+enum class TimeZone : u32 {
+    Auto,
+    Default,
+    CET,
+    CST6CDT,
+    Cuba,
+    EET,
+    Egypt,
+    Eire,
+    EST,
+    EST5EDT,
+    GB,
+    GBEire,
+    GMT,
+    GMTPlusZero,
+    GMTMinusZero,
+    GMTZero,
+    Greenwich,
+    Hongkong,
+    HST,
+    Iceland,
+    Iran,
+    Israel,
+    Jamaica,
+    Japan,
+    Kwajalein,
+    Libya,
+    MET,
+    MST,
+    MST7MDT,
+    Navajo,
+    NZ,
+    NZCHAT,
+    Poland,
+    Portugal,
+    PRC,
+    PST8PDT,
+    ROC,
+    ROK,
+    Singapore,
+    Turkey,
+    UCT,
+    Universal,
+    UTC,
+    W_SU,
+    WET,
+    Zulu,
+};
+
 enum class AnisotropyMode : u32 {
     Automatic = 0,
     Default = 1,
@@ -134,6 +214,7 @@ enum class Category : u32 {
     RendererAdvanced,
     RendererDebug,
     System,
+    SystemAudio,
     DataStorage,
     Debugging,
     DebuggingGraphics,
@@ -810,22 +891,31 @@ struct Values {
     SwitchableSetting<u8, false> bg_blue{linkage, 0, "bg_blue", Category::Renderer, true, true};
 
     // System
-    SwitchableSetting<bool> rng_seed_enabled{linkage, false, "rng_seed_enabled", Category::System};
-    SwitchableSetting<u32> rng_seed{linkage, 0, "rng_seed", Category::System};
-    Setting<std::string> device_name{linkage, "Yuzu", "device_name", Category::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
-    Setting<bool> custom_rtc_enabled{linkage, false, "custom_rtc_enabled", Category::System};
-    Setting<s64> custom_rtc{linkage, 0, "custom_rtc", Category::System};
+    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<s32, true> language_index{linkage,         1, 0, 17, "language_index",
-                                                Category::System};
-    SwitchableSetting<s32, true> region_index{linkage, 1, 0, 6, "region_index", Category::System};
-    SwitchableSetting<s32, true> time_zone_index{linkage,         0, 0, 45, "time_zone_index",
-                                                 Category::System};
-    SwitchableSetting<s32, true> sound_index{linkage, 1, 0, 2, "sound_index", Category::System};
+    SwitchableSetting<Language, true> language_index{linkage,
+                                                     Language::EnglishAmerican,
+                                                     Language::Japanese,
+                                                     Language::PortugueseBrazilian,
+                                                     "language_index",
+                                                     Category::System};
+    SwitchableSetting<Region, true> region_index{linkage,        Region::USA,    Region::Japan,
+                                                 Region::Taiwan, "region_index", Category::System};
+    SwitchableSetting<TimeZone, true> time_zone_index{linkage,           TimeZone::Auto,
+                                                      TimeZone::Auto,    TimeZone::Zulu,
+                                                      "time_zone_index", Category::System};
+    SwitchableSetting<s32, true> sound_index{
+        linkage, 1, 0, 2, "sound_index", Category::SystemAudio};
 
     SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System};
 
@@ -837,7 +927,7 @@ struct Values {
 #ifdef _WIN32
                                           true
 #else
-                                           false
+                                          false
 #endif
     };
     Setting<bool> controller_navigation{linkage, true, "controller_navigation", Category::Controls};
diff --git a/src/core/core.cpp b/src/core/core.cpp
index da1baa892..e2902a91f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -145,13 +145,7 @@ struct System::Impl {
         core_timing.SetMulticore(is_multicore);
         core_timing.Initialize([&system]() { system.RegisterHostThread(); });
 
-        const auto posix_time = std::chrono::system_clock::now().time_since_epoch();
-        const auto current_time =
-            std::chrono::duration_cast<std::chrono::seconds>(posix_time).count();
-        Settings::values.custom_rtc_differential =
-            (Settings::values.custom_rtc_enabled ? Settings::values.custom_rtc.GetValue()
-                                                 : current_time) -
-            current_time;
+        RefreshTime();
 
         // Create a default fs if one doesn't already exist.
         if (virtual_filesystem == nullptr) {
@@ -188,6 +182,16 @@ struct System::Impl {
         Initialize(system);
     }
 
+    void RefreshTime() {
+        const auto posix_time = std::chrono::system_clock::now().time_since_epoch();
+        const auto current_time =
+            std::chrono::duration_cast<std::chrono::seconds>(posix_time).count();
+        Settings::values.custom_rtc_differential =
+            (Settings::values.custom_rtc_enabled ? Settings::values.custom_rtc.GetValue()
+                                                 : current_time) -
+            current_time;
+    }
+
     void Run() {
         std::unique_lock<std::mutex> lk(suspend_guard);
 
@@ -1022,6 +1026,8 @@ void System::Exit() {
 }
 
 void System::ApplySettings() {
+    impl->RefreshTime();
+
     if (IsPoweredOn()) {
         Renderer().RefreshBaseSettings();
     }
diff --git a/src/core/file_sys/control_metadata.cpp b/src/core/file_sys/control_metadata.cpp
index cd9ac2e75..0697c29ae 100644
--- a/src/core/file_sys/control_metadata.cpp
+++ b/src/core/file_sys/control_metadata.cpp
@@ -68,7 +68,8 @@ NACP::NACP(VirtualFile file) {
 NACP::~NACP() = default;
 
 const LanguageEntry& NACP::GetLanguageEntry() const {
-    Language language = language_to_codes[Settings::values.language_index.GetValue()];
+    Language language =
+        language_to_codes[static_cast<s32>(Settings::values.language_index.GetValue())];
 
     {
         const auto& language_entry = raw.language_entries.at(static_cast<u8>(language));
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index d3286b352..2ba1b34a4 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -626,8 +626,8 @@ PatchManager::Metadata PatchManager::ParseControlNCA(const NCA& nca) const {
     auto nacp = nacp_file == nullptr ? nullptr : std::make_unique<NACP>(nacp_file);
 
     // Get language code from settings
-    const auto language_code =
-        Service::Set::GetLanguageCodeFromIndex(Settings::values.language_index.GetValue());
+    const auto language_code = Service::Set::GetLanguageCodeFromIndex(
+        static_cast<u32>(Settings::values.language_index.GetValue()));
 
     // Convert to application language and get priority list
     const auto application_language =
diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp
index 376067a95..91c5a2182 100644
--- a/src/core/hle/service/ns/ns.cpp
+++ b/src/core/hle/service/ns/ns.cpp
@@ -409,7 +409,7 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage(
 
     // Get language code from settings
     const auto language_code =
-        Set::GetLanguageCodeFromIndex(Settings::values.language_index.GetValue());
+        Set::GetLanguageCodeFromIndex(static_cast<s32>(Settings::values.language_index.GetValue()));
 
     // Convert to application language, get priority list
     const auto application_language = ConvertToApplicationLanguage(language_code);
diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp
index f5788b481..83f888c54 100644
--- a/src/core/hle/service/set/set.cpp
+++ b/src/core/hle/service/set/set.cpp
@@ -93,7 +93,8 @@ void GetAvailableLanguageCodesImpl(HLERequestContext& ctx, std::size_t max_entri
 }
 
 void GetKeyCodeMapImpl(HLERequestContext& ctx) {
-    const auto language_code = available_language_codes[Settings::values.language_index.GetValue()];
+    const auto language_code =
+        available_language_codes[static_cast<s32>(Settings::values.language_index.GetValue())];
     const auto key_code =
         std::find_if(language_to_layout.cbegin(), language_to_layout.cend(),
                      [=](const auto& element) { return element.first == language_code; });
@@ -162,7 +163,7 @@ void SET::GetQuestFlag(HLERequestContext& ctx) {
 
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(ResultSuccess);
-    rb.Push(static_cast<u32>(Settings::values.quest_flag.GetValue()));
+    rb.Push(static_cast<s32>(Settings::values.quest_flag.GetValue()));
 }
 
 void SET::GetLanguageCode(HLERequestContext& ctx) {
@@ -170,7 +171,8 @@ void SET::GetLanguageCode(HLERequestContext& ctx) {
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
-    rb.PushEnum(available_language_codes[Settings::values.language_index.GetValue()]);
+    rb.PushEnum(
+        available_language_codes[static_cast<s32>(Settings::values.language_index.GetValue())]);
 }
 
 void SET::GetRegionCode(HLERequestContext& ctx) {
@@ -178,7 +180,7 @@ void SET::GetRegionCode(HLERequestContext& ctx) {
 
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(ResultSuccess);
-    rb.Push(Settings::values.region_index.GetValue());
+    rb.Push(static_cast<u32>(Settings::values.region_index.GetValue()));
 }
 
 void SET::GetKeyCodeMap(HLERequestContext& ctx) {
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 3181a9528..28ee5d492 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -696,6 +696,7 @@ void Config::ReadSystemValues() {
     qt_config->beginGroup(QStringLiteral("System"));
 
     ReadCategory(Settings::Category::System);
+    ReadCategory(Settings::Category::SystemAudio);
 
     qt_config->endGroup();
 }
@@ -1134,6 +1135,7 @@ void Config::SaveSystemValues() {
     qt_config->beginGroup(QStringLiteral("System"));
 
     WriteCategory(Settings::Category::System);
+    WriteCategory(Settings::Category::SystemAudio);
 
     qt_config->endGroup();
 }
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index 8baa8de1e..3a94fee9e 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -48,7 +48,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
       input_tab{std::make_unique<ConfigureInput>(system_, this)},
       network_tab{std::make_unique<ConfigureNetwork>(system_, this)},
       profile_tab{std::make_unique<ConfigureProfileManager>(system_, this)},
-      system_tab{std::make_unique<ConfigureSystem>(system_, nullptr, this)},
+      system_tab{std::make_unique<ConfigureSystem>(system_, nullptr, *translations, this)},
       ui_tab{std::make_unique<ConfigureUi>(system_, this)}, web_tab{std::make_unique<ConfigureWeb>(
                                                                 this)} {
     Settings::SetConfiguringGlobal(true);
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index ae3cf269f..977aed42d 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -240,7 +240,7 @@ void ConfigureGraphics::Setup() {
                 return new ConfigurationShared::Widget(
                     setting, translations, this, runtime_lock, apply_funcs,
                     ConfigurationShared::RequestType::SpinBox, true, 1.0f,
-                    &Settings::values.speed_limit, QStringLiteral("%"));
+                    &Settings::values.speed_limit, "%");
             } else {
                 return new ConfigurationShared::Widget(setting, translations, this, runtime_lock,
                                                        apply_funcs);
diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index 5548fc2ba..c39855334 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -58,7 +58,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
         system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
         tab_group, *translations, this);
     input_tab = std::make_unique<ConfigureInputPerGame>(system_, game_config.get(), this);
-    system_tab = std::make_unique<ConfigureSystem>(system_, tab_group, this);
+    system_tab = std::make_unique<ConfigureSystem>(system_, tab_group, *translations, this);
 
     ui->setupUi(this);
 
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 4872a475b..dedbad57f 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -2,17 +2,22 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <chrono>
+#include <forward_list>
 #include <optional>
 
+#include <QDateTimeEdit>
 #include <QFileDialog>
 #include <QGraphicsItem>
+#include <QLineEdit>
 #include <QMessageBox>
 #include "common/settings.h"
 #include "core/core.h"
 #include "core/hle/service/time/time_manager.h"
 #include "ui_configure_system.h"
+#include "yuzu/configuration/config.h"
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_system.h"
+#include "yuzu/configuration/shared_widget.h"
 
 constexpr std::array<u32, 7> LOCALE_BLOCKLIST{
     // pzzefezrpnkzeidfej
@@ -39,44 +44,42 @@ static bool IsValidLocale(u32 region_index, u32 language_index) {
 
 ConfigureSystem::ConfigureSystem(
     Core::System& system_, std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
-    QWidget* parent)
-    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureSystem>()}, system{system_} {
+    ConfigurationShared::TranslationMap& translations_, QWidget* parent)
+    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureSystem>()}, system{system_},
+      translations{translations_} {
     ui->setupUi(this);
 
-    connect(ui->rng_seed_checkbox, &QCheckBox::stateChanged, this, [this](int state) {
-        ui->rng_seed_edit->setEnabled(state == Qt::Checked);
+    Setup();
+
+    connect(rng_seed_checkbox, &QCheckBox::stateChanged, this, [this](int state) {
+        rng_seed_edit->setEnabled(state == Qt::Checked);
         if (state != Qt::Checked) {
-            ui->rng_seed_edit->setText(QStringLiteral("00000000"));
+            rng_seed_edit->setText(QStringLiteral("00000000"));
         }
     });
 
-    connect(ui->custom_rtc_checkbox, &QCheckBox::stateChanged, this, [this](int state) {
-        ui->custom_rtc_edit->setEnabled(state == Qt::Checked);
+    connect(custom_rtc_checkbox, &QCheckBox::stateChanged, this, [this](int state) {
+        custom_rtc_edit->setEnabled(state == Qt::Checked);
         if (state != Qt::Checked) {
-            ui->custom_rtc_edit->setDateTime(QDateTime::currentDateTime());
+            custom_rtc_edit->setDateTime(QDateTime::currentDateTime());
         }
     });
 
     const auto locale_check = [this](int index) {
-        const auto region_index = ConfigurationShared::GetComboboxIndex(
-            Settings::values.region_index.GetValue(true), ui->combo_region);
-        const auto language_index = ConfigurationShared::GetComboboxIndex(
-            Settings::values.language_index.GetValue(true), ui->combo_language);
+        const auto region_index = combo_region->currentIndex();
+        const auto language_index = combo_language->currentIndex();
         const bool valid_locale = IsValidLocale(region_index, language_index);
         ui->label_warn_invalid_locale->setVisible(!valid_locale);
         if (!valid_locale) {
             ui->label_warn_invalid_locale->setText(
                 tr("Warning: \"%1\" is not a valid language for region \"%2\"")
-                    .arg(ui->combo_language->currentText())
-                    .arg(ui->combo_region->currentText()));
+                    .arg(combo_language->currentText())
+                    .arg(combo_region->currentText()));
         }
     };
 
-    connect(ui->combo_language, qOverload<int>(&QComboBox::currentIndexChanged), this,
-            locale_check);
-    connect(ui->combo_region, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
-
-    SetupPerGameUI();
+    connect(combo_language, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
+    connect(combo_region, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
 
     SetConfiguration();
 }
@@ -95,137 +98,94 @@ void ConfigureSystem::RetranslateUI() {
     ui->retranslateUi(this);
 }
 
-void ConfigureSystem::SetConfiguration() {
-    enabled = !system.IsPoweredOn();
-    const auto rng_seed = QStringLiteral("%1")
-                              .arg(Settings::values.rng_seed.GetValue(), 8, 16, QLatin1Char{'0'})
-                              .toUpper();
-    const auto rtc_time = Settings::values.custom_rtc_enabled
-                              ? Settings::values.custom_rtc.GetValue()
-                              : QDateTime::currentSecsSinceEpoch();
-
-    ui->rng_seed_checkbox->setChecked(Settings::values.rng_seed_enabled.GetValue());
-    ui->rng_seed_edit->setEnabled(Settings::values.rng_seed_enabled.GetValue() &&
-                                  Settings::values.rng_seed.UsingGlobal());
-    ui->rng_seed_edit->setText(rng_seed);
-
-    ui->custom_rtc_checkbox->setChecked(Settings::values.custom_rtc_enabled.GetValue());
-    ui->custom_rtc_edit->setEnabled(Settings::values.custom_rtc_enabled.GetValue());
-    ui->custom_rtc_edit->setDateTime(QDateTime::fromSecsSinceEpoch(rtc_time));
-    ui->device_name_edit->setText(
-        QString::fromUtf8(Settings::values.device_name.GetValue().c_str()));
-    ui->use_unsafe_extended_memory_layout->setEnabled(enabled);
-    ui->use_unsafe_extended_memory_layout->setChecked(
-        Settings::values.use_unsafe_extended_memory_layout.GetValue());
-
-    if (Settings::IsConfiguringGlobal()) {
-        ui->combo_language->setCurrentIndex(Settings::values.language_index.GetValue());
-        ui->combo_region->setCurrentIndex(Settings::values.region_index.GetValue());
-        ui->combo_time_zone->setCurrentIndex(Settings::values.time_zone_index.GetValue());
-    } else {
-        ConfigurationShared::SetPerGameSetting(ui->combo_language,
-                                               &Settings::values.language_index);
-        ConfigurationShared::SetPerGameSetting(ui->combo_region, &Settings::values.region_index);
-        ConfigurationShared::SetPerGameSetting(ui->combo_time_zone,
-                                               &Settings::values.time_zone_index);
-
-        ConfigurationShared::SetHighlight(ui->label_language,
-                                          !Settings::values.language_index.UsingGlobal());
-        ConfigurationShared::SetHighlight(ui->label_region,
-                                          !Settings::values.region_index.UsingGlobal());
-        ConfigurationShared::SetHighlight(ui->label_timezone,
-                                          !Settings::values.time_zone_index.UsingGlobal());
-    }
-}
+void ConfigureSystem::Setup() {
+    const bool runtime_lock = !system.IsPoweredOn();
+    auto& core_layout = *ui->core_widget->layout();
+    auto& system_layout = *ui->system_widget->layout();
 
-void ConfigureSystem::ReadSystemSettings() {}
+    std::map<std::string, QWidget*> core_hold{};
+    std::map<bool, std::map<std::string, QWidget*>> system_hold{};
 
-void ConfigureSystem::ApplyConfiguration() {
-    // Allow setting custom RTC even if system is powered on,
-    // to allow in-game time to be fast forwarded
-    if (Settings::IsConfiguringGlobal()) {
-        if (ui->custom_rtc_checkbox->isChecked()) {
-            Settings::values.custom_rtc_enabled = true;
-            Settings::values.custom_rtc = ui->custom_rtc_edit->dateTime().toSecsSinceEpoch();
-            if (system.IsPoweredOn()) {
-                const s64 posix_time{Settings::values.custom_rtc.GetValue() +
-                                     Service::Time::TimeManager::GetExternalTimeZoneOffset()};
-                system.GetTimeManager().UpdateLocalSystemClockTime(posix_time);
-            }
-        } else {
-            Settings::values.custom_rtc_enabled = false;
+    std::forward_list<Settings::BasicSetting*> settings;
+    auto push = [&settings](std::forward_list<Settings::BasicSetting*>& list) {
+        for (auto setting : list) {
+            settings.push_front(setting);
         }
-    }
+    };
 
-    Settings::values.device_name = ui->device_name_edit->text().toStdString();
+    push(Settings::values.linkage.by_category[Settings::Category::Core]);
+    push(Settings::values.linkage.by_category[Settings::Category::System]);
+
+    for (auto setting : settings) {
+        ConfigurationShared::Widget* widget = [=]() {
+            if (setting->Id() == Settings::values.custom_rtc_enabled.Id()) {
+                return new ConfigurationShared::Widget(
+                    setting, translations, this, runtime_lock, apply_funcs,
+                    ConfigurationShared::RequestType::DateTimeEdit, true, 1.0f,
+                    &Settings::values.custom_rtc);
+            } else if (setting->Id() == Settings::values.rng_seed_enabled.Id()) {
+                return new ConfigurationShared::Widget(setting, translations, this, runtime_lock,
+                                                       apply_funcs,
+                                                       ConfigurationShared::RequestType::HexEdit,
+                                                       true, 1.0f, &Settings::values.rng_seed);
+            } else {
+                return new ConfigurationShared::Widget(setting, translations, this, runtime_lock,
+
+                                                       apply_funcs);
+            }
+        }();
 
-    if (!enabled) {
-        return;
-    }
+        if (!widget->Valid()) {
+            delete widget;
+            continue;
+        }
+
+        if (setting->Id() == Settings::values.rng_seed_enabled.Id()) {
+            rng_seed_checkbox = widget->checkbox;
+            rng_seed_edit = widget->line_edit;
 
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.language_index, ui->combo_language);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.region_index, ui->combo_region);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.time_zone_index,
-                                             ui->combo_time_zone);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_unsafe_extended_memory_layout,
-                                             ui->use_unsafe_extended_memory_layout,
-                                             use_unsafe_extended_memory_layout);
-
-    if (Settings::IsConfiguringGlobal()) {
-        // Guard if during game and set to game-specific value
-        if (Settings::values.rng_seed.UsingGlobal()) {
-            Settings::values.rng_seed_enabled = ui->rng_seed_checkbox->isChecked();
-            if (ui->rng_seed_checkbox->isChecked()) {
-                Settings::values.rng_seed.SetValue(ui->rng_seed_edit->text().toUInt(nullptr, 16));
+            if (!Settings::values.rng_seed_enabled.GetValue()) {
+                rng_seed_edit->setEnabled(false);
             }
+        } else if (setting->Id() == Settings::values.custom_rtc_enabled.Id()) {
+            custom_rtc_checkbox = widget->checkbox;
+            custom_rtc_edit = widget->date_time_edit;
+
+            custom_rtc_edit->setEnabled(Settings::values.custom_rtc_enabled.GetValue());
+        } else if (setting->Id() == Settings::values.region_index.Id()) {
+
+            combo_region = widget->combobox;
+        } else if (setting->Id() == Settings::values.language_index.Id()) {
+            combo_language = widget->combobox;
         }
-    } else {
-        switch (use_rng_seed) {
-        case ConfigurationShared::CheckState::On:
-        case ConfigurationShared::CheckState::Off:
-            Settings::values.rng_seed_enabled.SetGlobal(false);
-            Settings::values.rng_seed.SetGlobal(false);
-            if (ui->rng_seed_checkbox->isChecked()) {
-                Settings::values.rng_seed.SetValue(ui->rng_seed_edit->text().toUInt(nullptr, 16));
-            }
-            break;
-        case ConfigurationShared::CheckState::Global:
-            Settings::values.rng_seed_enabled.SetGlobal(true);
-            Settings::values.rng_seed.SetGlobal(true);
+
+        switch (setting->Category()) {
+        case Settings::Category::Core:
+            core_hold[setting->GetLabel()] = widget;
             break;
-        case ConfigurationShared::CheckState::Count:
+        case Settings::Category::System:
+            system_hold[setting->IsEnum()].insert(std::pair{setting->GetLabel(), widget});
             break;
+        default:
+            delete widget;
         }
     }
+    for (const auto& [label, widget] : core_hold) {
+        core_layout.addWidget(widget);
+    }
+    for (const auto& [label, widget] : system_hold[true]) {
+        system_layout.addWidget(widget);
+    }
+    for (const auto& [label, widget] : system_hold[false]) {
+        system_layout.addWidget(widget);
+    }
 }
 
-void ConfigureSystem::SetupPerGameUI() {
-    if (Settings::IsConfiguringGlobal()) {
-        ui->combo_language->setEnabled(Settings::values.language_index.UsingGlobal());
-        ui->combo_region->setEnabled(Settings::values.region_index.UsingGlobal());
-        ui->combo_time_zone->setEnabled(Settings::values.time_zone_index.UsingGlobal());
-        ui->rng_seed_checkbox->setEnabled(Settings::values.rng_seed.UsingGlobal());
-        ui->rng_seed_edit->setEnabled(Settings::values.rng_seed.UsingGlobal());
+void ConfigureSystem::SetConfiguration() {}
 
-        return;
+void ConfigureSystem::ApplyConfiguration() {
+    const bool powered_on = system.IsPoweredOn();
+    for (const auto& func : apply_funcs) {
+        func(powered_on);
     }
-
-    ConfigurationShared::SetColoredComboBox(ui->combo_language, ui->label_language,
-                                            Settings::values.language_index.GetValue(true));
-    ConfigurationShared::SetColoredComboBox(ui->combo_region, ui->label_region,
-                                            Settings::values.region_index.GetValue(true));
-    ConfigurationShared::SetColoredComboBox(ui->combo_time_zone, ui->label_timezone,
-                                            Settings::values.time_zone_index.GetValue(true));
-
-    ConfigurationShared::SetColoredTristate(
-        ui->rng_seed_checkbox, Settings::values.rng_seed.UsingGlobal(),
-        Settings::values.rng_seed_enabled.GetValue(),
-        Settings::values.rng_seed_enabled.GetValue(true), use_rng_seed);
-
-    ConfigurationShared::SetColoredTristate(ui->use_unsafe_extended_memory_layout,
-                                            Settings::values.use_unsafe_extended_memory_layout,
-                                            use_unsafe_extended_memory_layout);
-
-    ui->custom_rtc_checkbox->setVisible(false);
-    ui->custom_rtc_edit->setVisible(false);
 }
diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index 6064b5b40..87b575060 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -3,11 +3,15 @@
 
 #pragma once
 
+#include <forward_list>
+#include <functional>
 #include <memory>
 
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
 
+class QDateTimeEdit;
+
 namespace Core {
 class System;
 }
@@ -20,6 +24,7 @@ class ConfigureSystem : public ConfigurationShared::Tab {
 public:
     explicit ConfigureSystem(Core::System& system_,
                              std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                             ConfigurationShared::TranslationMap& translations,
                              QWidget* parent = nullptr);
     ~ConfigureSystem() override;
 
@@ -30,9 +35,9 @@ private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void ReadSystemSettings();
+    void Setup();
 
-    void SetupPerGameUI();
+    std::forward_list<std::function<void(bool)>> apply_funcs{};
 
     std::unique_ptr<Ui::ConfigureSystem> ui;
     bool enabled = false;
@@ -41,4 +46,12 @@ private:
     ConfigurationShared::CheckState use_unsafe_extended_memory_layout;
 
     Core::System& system;
+    ConfigurationShared::TranslationMap& translations;
+
+    QCheckBox* rng_seed_checkbox;
+    QLineEdit* rng_seed_edit;
+    QCheckBox* custom_rtc_checkbox;
+    QDateTimeEdit* custom_rtc_edit;
+    QComboBox* combo_region;
+    QComboBox* combo_language;
 };
diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui
index e0caecd5e..a5a3e2dc3 100644
--- a/src/yuzu/configuration/configure_system.ui
+++ b/src/yuzu/configuration/configure_system.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>366</width>
+    <width>605</width>
     <height>483</height>
    </rect>
   </property>
@@ -22,470 +22,53 @@
      <item>
       <widget class="QGroupBox" name="group_system_settings">
        <property name="title">
-        <string>System Settings</string>
+        <string>System</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_region">
-            <property name="text">
-             <string>Region:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="combo_time_zone">
-            <item>
-             <property name="text">
-              <string>Auto</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>CET</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>CST6CDT</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Cuba</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>EET</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Egypt</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Eire</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>EST</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>EST5EDT</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>GB</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>GB-Eire</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>GMT</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>GMT+0</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>GMT-0</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>GMT0</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Greenwich</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Hongkong</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>HST</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Iceland</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Iran</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Israel</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Jamaica</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Japan</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Kwajalein</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Libya</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>MET</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>MST</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>MST7MDT</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Navajo</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>NZ</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>NZ-CHAT</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Poland</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Portugal</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>PRC</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>PST8PDT</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ROC</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>ROK</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Singapore</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Turkey</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>UCT</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Universal</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>UTC</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>W-SU</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>WET</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Zulu</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="combo_region">
-            <item>
-             <property name="text">
-              <string>Japan</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>USA</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Europe</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Australia</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>China</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Korea</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Taiwan</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_timezone">
-            <property name="text">
-             <string>Time Zone:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="combo_language">
-            <property name="toolTip">
-             <string>Note: this can be overridden when region setting is auto-select</string>
-            </property>
-            <item>
-             <property name="text">
-              <string>Japanese (日本語)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>American English</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>French (français)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>German (Deutsch)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Italian (italiano)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Spanish (español)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Chinese</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Korean (한국어)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Dutch (Nederlands)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Portuguese (português)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Russian (Русский)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Taiwanese</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>British English</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Canadian French</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Latin American Spanish</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simplified Chinese</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Traditional Chinese (正體中文)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Brazilian Portuguese (português do Brasil)</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QCheckBox" name="custom_rtc_checkbox">
-            <property name="text">
-             <string>Custom RTC</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_language">
-            <property name="text">
-             <string>Language</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="QCheckBox" name="rng_seed_checkbox">
-            <property name="text">
-             <string>RNG Seed</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="device_name_label">
-            <property name="text">
-             <string>Device Name</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QDateTimeEdit" name="custom_rtc_edit">
-            <property name="minimumDate">
-             <date>
-              <year>1970</year>
-              <month>1</month>
-              <day>1</day>
-             </date>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QLineEdit" name="device_name_edit">
-            <property name="maxLength">
-             <number>128</number>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <widget class="QLineEdit" name="rng_seed_edit">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <family>Lucida Console</family>
-             </font>
-            </property>
-            <property name="inputMask">
-             <string notr="true">HHHHHHHH</string>
-            </property>
-            <property name="maxLength">
-             <number>8</number>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
-           <widget class="QCheckBox" name="use_unsafe_extended_memory_layout">
-            <property name="text">
-             <string>Unsafe extended memory layout (8GB DRAM)</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
+         <widget class="QWidget" name="system_widget" native="true">
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>Core</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_6">
+        <item>
+         <widget class="QWidget" name="core_widget" native="true">
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+          </layout>
+         </widget>
         </item>
        </layout>
       </widget>
@@ -506,7 +89,7 @@
      <item>
       <widget class="QLabel" name="label_warn_invalid_locale">
        <property name="text">
-        <string></string>
+        <string/>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index d38815e77..dc9f15cdd 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -109,15 +109,16 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
 
     // System
     INSERT(Settings, rng_seed_enabled, "RNG Seed", "");
-    INSERT(Settings, rng_seed, "RNG Seed", "");
+    INSERT(Settings, rng_seed, "", "");
     INSERT(Settings, device_name, "Device Name", "");
     INSERT(Settings, custom_rtc_enabled, "Custom RTC", "");
-    INSERT(Settings, custom_rtc, "Custom RTC", "");
+    INSERT(Settings, custom_rtc, "", "");
     INSERT(Settings, language_index, "Language:", "");
     INSERT(Settings, region_index, "Region:", "");
     INSERT(Settings, time_zone_index, "Time Zone:", "");
     INSERT(Settings, sound_index, "Sound Output Mode:", "");
     INSERT(Settings, use_docked_mode, "", "");
+    INSERT(Settings, current_user, "", "");
 
     // Controls
 
@@ -231,6 +232,44 @@ std::forward_list<QString> ComboboxEnumeration(std::type_index type, QWidget* pa
         return {
             tr("Automatic"), tr("Default"), tr("2x"), tr("4x"), tr("8x"), tr("16x"),
         };
+    } else if (type == typeid(Settings::Language)) {
+        return {
+            tr("Japanese (日本語)"),
+            tr("American English"),
+            tr("French (français)"),
+            tr("German (Deutsch)"),
+            tr("Italian (italiano)"),
+            tr("Spanish (español)"),
+            tr("Chinese"),
+            tr("Korean (한국어)"),
+            tr("Dutch (Nederlands)"),
+            tr("Portuguese (português)"),
+            tr("Russian (Русский)"),
+            tr("Taiwanese"),
+            tr("British English"),
+            tr("Canadian French"),
+            tr("Latin American Spanish"),
+            tr("Simplified Chinese"),
+            tr("Traditional Chinese (正體中文)"),
+            tr("Brazilian Portuguese (português do Brasil)"),
+        };
+    } else if (type == typeid(Settings::Region)) {
+        return {
+            tr("Japan"), tr("USA"),   tr("Europe"), tr("Australia"),
+            tr("China"), tr("Korea"), tr("Taiwan"),
+        };
+    } else if (type == typeid(Settings::TimeZone)) {
+        return {
+            tr("Auto"),    tr("Default"),   tr("CET"),       tr("CST6CDT"),   tr("Cuba"),
+            tr("EET"),     tr("Egypt"),     tr("Eire"),      tr("EST"),       tr("EST5EDT"),
+            tr("GB"),      tr("GB-Eire"),   tr("GMT"),       tr("GMT+0"),     tr("GMT-0"),
+            tr("GMT0"),    tr("Greenwich"), tr("Hongkong"),  tr("HST"),       tr("Iceland"),
+            tr("Iran"),    tr("Israel"),    tr("Jamaica"),   tr("Kwajalein"), tr("Libya"),
+            tr("MET"),     tr("MST"),       tr("MST7MDT"),   tr("Navajo"),    tr("NZ"),
+            tr("NZ-CHAT"), tr("Poland"),    tr("Portugal"),  tr("PRC"),       tr("PST8PDT"),
+            tr("ROC"),     tr("ROK"),       tr("Singapore"), tr("Turkey"),    tr("UCT"),
+            tr("W-SU"),    tr("WET"),       tr("Zulu"),
+        };
     }
 
     return {};
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index d1113f793..0d553c67f 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -1,5 +1,7 @@
 #include <functional>
+#include <limits>
 #include <QCheckBox>
+#include <QDateTimeEdit>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QLabel>
@@ -9,6 +11,9 @@
 #include <QSpinBox>
 #include <QWidget>
 #include <qabstractbutton.h>
+#include <qabstractspinbox.h>
+#include <qnamespace.h>
+#include <qvalidator.h>
 #include "common/common_types.h"
 #include "common/settings.h"
 #include "yuzu/configuration/configuration_shared.h"
@@ -25,7 +30,7 @@ QPushButton* Widget::CreateRestoreGlobalButton(Settings::BasicSetting& setting,
     QStyle* style = parent->style();
     QIcon* icon = new QIcon(style->standardIcon(QStyle::SP_DialogResetButton));
     QPushButton* restore_button = new QPushButton(*icon, QStringLiteral(""), parent);
-    restore_button->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
+    restore_button->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
 
     QSizePolicy sp_retain = restore_button->sizePolicy();
     sp_retain.setRetainSizeWhenHidden(true);
@@ -241,6 +246,67 @@ void Widget::CreateSlider(const QString& name, bool reversed, float multiplier,
     }
 }
 
+void Widget::CreateCheckBoxWithHexEdit(const QString& label, Settings::BasicSetting* other_setting,
+                                       std::function<void()>& load_func) {
+    if (other_setting == nullptr) {
+        LOG_WARNING(Frontend, "Extra setting is null or not an integer");
+        return;
+    }
+    created = true;
+
+    std::function<void()> checkbox_load_func;
+    CreateCheckBox(label, checkbox_load_func);
+
+    auto to_hex = [=](const std::string& input) {
+        return QString::fromStdString(fmt::format("{:08x}", std::stoi(input)));
+    };
+
+    QHBoxLayout* layout = reinterpret_cast<QHBoxLayout*>(this->layout());
+    const QString default_val = to_hex(other_setting->ToString());
+
+    line_edit = new QLineEdit(this);
+    line_edit->setText(default_val);
+
+    checkbox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    layout->insertWidget(1, line_edit);
+
+    line_edit->setMaxLength(8);
+    QRegExpValidator* regex =
+        new QRegExpValidator{QRegExp{QStringLiteral("^[0-9a-fA-F]{0,8}$")}, line_edit};
+    line_edit->setValidator(regex);
+
+    auto hex_to_dec = [=]() -> std::string {
+        return std::to_string(std::stoul(line_edit->text().toStdString(), nullptr, 16));
+    };
+
+    if (Settings::IsConfiguringGlobal()) {
+        load_func = [=]() {
+            checkbox_load_func();
+            other_setting->LoadString(hex_to_dec());
+        };
+    } else {
+        QObject::connect(restore_button, &QAbstractButton::clicked, [=](bool) {
+            line_edit->setText(to_hex(other_setting->ToStringGlobal()));
+        });
+
+        QObject::connect(line_edit, &QLineEdit::textEdited, [=](const QString&) {
+            restore_button->setEnabled(true);
+            restore_button->setVisible(true);
+        });
+
+        load_func = [=]() {
+            checkbox_load_func();
+
+            const bool using_global = !restore_button->isEnabled();
+            other_setting->SetGlobal(using_global);
+            if (!using_global) {
+                other_setting->LoadString(hex_to_dec());
+            }
+        };
+    }
+}
+
 void Widget::CreateCheckBoxWithLineEdit(const QString& label, Settings::BasicSetting* other_setting,
                                         std::function<void()>& load_func) {
     if (other_setting == nullptr) {
@@ -268,8 +334,9 @@ void Widget::CreateCheckBoxWithLineEdit(const QString& label, Settings::BasicSet
             other_setting->LoadString(line_edit->text().toStdString());
         };
     } else {
-        QObject::connect(restore_button, &QAbstractButton::clicked,
-                         [=](bool) { line_edit->setText(default_val); });
+        QObject::connect(restore_button, &QAbstractButton::clicked, [=](bool) {
+            line_edit->setText(QString::fromStdString(other_setting->ToStringGlobal()));
+        });
 
         QObject::connect(line_edit, &QLineEdit::textEdited, [=](const QString&) {
             restore_button->setEnabled(true);
@@ -279,7 +346,7 @@ void Widget::CreateCheckBoxWithLineEdit(const QString& label, Settings::BasicSet
         load_func = [=]() {
             checkbox_load_func();
 
-            const bool using_global = !restore_button->isVisible();
+            const bool using_global = !restore_button->isEnabled();
             other_setting->SetGlobal(using_global);
             if (!using_global) {
                 other_setting->LoadString(line_edit->text().toStdString());
@@ -289,7 +356,8 @@ void Widget::CreateCheckBoxWithLineEdit(const QString& label, Settings::BasicSet
 }
 
 void Widget::CreateCheckBoxWithSpinBox(const QString& label, Settings::BasicSetting* other_setting,
-                                       std::function<void()>& load_func, const QString& suffix) {
+                                       std::function<void()>& load_func,
+                                       const std::string& suffix) {
     if (other_setting == nullptr && IsInt(other_setting->TypeId())) {
         LOG_WARNING(Frontend, "Extra setting is null or not an integer");
         return;
@@ -308,7 +376,7 @@ void Widget::CreateCheckBoxWithSpinBox(const QString& label, Settings::BasicSett
     const int default_val = std::stoi(other_setting->ToString());
     spinbox->setRange(min_val, max_val);
     spinbox->setValue(default_val);
-    spinbox->setSuffix(suffix);
+    spinbox->setSuffix(QString::fromStdString(suffix));
     spinbox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
     layout->insertWidget(1, spinbox);
@@ -320,7 +388,7 @@ void Widget::CreateCheckBoxWithSpinBox(const QString& label, Settings::BasicSett
         };
     } else {
         QObject::connect(restore_button, &QAbstractButton::clicked, [this, other_setting](bool) {
-            spinbox->setValue(std::stoi(other_setting->ToString()));
+            spinbox->setValue(std::stoi(other_setting->ToStringGlobal()));
         });
 
         QObject::connect(spinbox, QOverload<int>::of(&QSpinBox::valueChanged), [this](int) {
@@ -331,7 +399,7 @@ void Widget::CreateCheckBoxWithSpinBox(const QString& label, Settings::BasicSett
         load_func = [=]() {
             checkbox_load_func();
 
-            const bool using_global = !restore_button->isVisible();
+            const bool using_global = !restore_button->isEnabled();
             other_setting->SetGlobal(using_global);
             if (!using_global) {
                 other_setting->LoadString(std::to_string(spinbox->value()));
@@ -340,6 +408,81 @@ void Widget::CreateCheckBoxWithSpinBox(const QString& label, Settings::BasicSett
     }
 }
 
+// Currently tailored to custom_rtc
+void Widget::CreateCheckBoxWithDateTimeEdit(const QString& label,
+                                            Settings::BasicSetting* other_setting,
+                                            std::function<void()>& load_func) {
+    if (other_setting == nullptr) {
+        LOG_WARNING(Frontend, "Extra setting is null or not an integer");
+        return;
+    }
+    created = true;
+
+    std::function<void()> checkbox_load_func;
+    CreateCheckBox(label, checkbox_load_func);
+
+    QHBoxLayout* layout = reinterpret_cast<QHBoxLayout*>(this->layout());
+    const bool disabled = setting.ToString() != "true";
+    const long long current_time = QDateTime::currentSecsSinceEpoch();
+    const s64 the_time = disabled ? current_time : std::stoll(other_setting->ToString());
+    const auto default_val = QDateTime::fromSecsSinceEpoch(the_time);
+
+    date_time_edit = new QDateTimeEdit(this);
+    date_time_edit->setDateTime(default_val);
+
+    date_time_edit->setMinimumDateTime(QDateTime::fromSecsSinceEpoch(0));
+
+    date_time_edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    checkbox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    layout->insertWidget(1, date_time_edit);
+
+    if (Settings::IsConfiguringGlobal()) {
+        load_func = [=]() {
+            checkbox_load_func();
+            if (checkbox->checkState() == Qt::Unchecked) {
+                return;
+            }
+
+            other_setting->LoadString(
+                std::to_string(date_time_edit->dateTime().toSecsSinceEpoch()));
+        };
+    } else {
+        auto get_clear_val = [=]() {
+            return QDateTime::fromSecsSinceEpoch([=]() {
+                if (checkbox->checkState() == Qt::Checked) {
+                    return std::stoll(other_setting->ToStringGlobal());
+                }
+                return current_time;
+            }());
+        };
+
+        QObject::connect(restore_button, &QAbstractButton::clicked,
+                         [=](bool) { date_time_edit->setDateTime(get_clear_val()); });
+
+        QObject::connect(date_time_edit, &QDateTimeEdit::editingFinished, [=]() {
+            if (date_time_edit->dateTime() != get_clear_val()) {
+                restore_button->setEnabled(true);
+                restore_button->setVisible(true);
+            }
+        });
+
+        load_func = [=]() {
+            checkbox_load_func();
+            if (checkbox->checkState() == Qt::Unchecked) {
+                return;
+            }
+
+            const bool using_global = !restore_button->isEnabled();
+            other_setting->SetGlobal(using_global);
+            if (!using_global) {
+                other_setting->LoadString(
+                    std::to_string(date_time_edit->dateTime().toSecsSinceEpoch()));
+            }
+        };
+    }
+}
+
 bool Widget::Valid() {
     return created;
 }
@@ -350,7 +493,7 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
                QWidget* parent_, bool runtime_lock,
                std::forward_list<std::function<void(bool)>>& apply_funcs, RequestType request,
                bool managed, float multiplier, Settings::BasicSetting* other_setting,
-               const QString& format)
+               const std::string& string)
     : QWidget(parent_), parent{parent_}, translations{translations_}, setting{*setting_} {
     if (!Settings::IsConfiguringGlobal() && !setting.Switchable()) {
         LOG_DEBUG(Frontend, "\"{}\" is not switchable, skipping...", setting.GetLabel());
@@ -379,19 +522,26 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
 
     if (type == typeid(bool)) {
         switch (request) {
-        case RequestType::SpinBox:
-            CreateCheckBoxWithSpinBox(label, other_setting, load_func, format);
-            break;
         case RequestType::Default:
             CreateCheckBox(label, load_func);
             break;
+        case RequestType::SpinBox:
+            CreateCheckBoxWithSpinBox(label, other_setting, load_func, string);
+            break;
+        case RequestType::HexEdit:
+            CreateCheckBoxWithHexEdit(label, other_setting, load_func);
+            break;
         case RequestType::LineEdit:
             CreateCheckBoxWithLineEdit(label, other_setting, load_func);
             break;
+        case RequestType::DateTimeEdit:
+            CreateCheckBoxWithDateTimeEdit(label, other_setting, load_func);
+            break;
         case RequestType::ComboBox:
         case RequestType::Slider:
         case RequestType::ReverseSlider:
         case RequestType::MaxEnum:
+            LOG_DEBUG(Frontend, "Requested widget is unimplemented.");
             break;
         }
     } else if (setting.IsEnum()) {
@@ -409,10 +559,15 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
         case RequestType::ComboBox:
             CreateCombobox(label, managed, load_func);
             break;
+        case RequestType::DateTimeEdit:
         case RequestType::SpinBox:
+        case RequestType::HexEdit:
         case RequestType::MaxEnum:
+            LOG_DEBUG(Frontend, "Requested widget is unimplemented.");
             break;
         }
+    } else if (type == typeid(std::string)) {
+        CreateLineEdit(label, managed, load_func);
     }
 
     if (!created) {
diff --git a/src/yuzu/configuration/shared_widget.h b/src/yuzu/configuration/shared_widget.h
index 88a864b42..9923aa2ea 100644
--- a/src/yuzu/configuration/shared_widget.h
+++ b/src/yuzu/configuration/shared_widget.h
@@ -9,6 +9,7 @@ class QComboBox;
 class QLineEdit;
 class QSlider;
 class QCheckBox;
+class QDateTimeEdit;
 
 namespace Settings {
 class BasicSetting;
@@ -23,6 +24,8 @@ enum class RequestType {
     Slider,
     ReverseSlider,
     LineEdit,
+    HexEdit,
+    DateTimeEdit,
     MaxEnum,
 };
 
@@ -33,8 +36,7 @@ public:
     Widget(Settings::BasicSetting* setting, const TranslationMap& translations, QWidget* parent,
            bool runtime_lock, std::forward_list<std::function<void(bool)>>& apply_funcs,
            RequestType request = RequestType::Default, bool managed = true, float multiplier = 1.0f,
-           Settings::BasicSetting* other_setting = nullptr,
-           const QString& format = QStringLiteral(""));
+           Settings::BasicSetting* other_setting = nullptr, const std::string& format = "");
     virtual ~Widget();
 
     bool Valid();
@@ -48,13 +50,18 @@ public:
     QCheckBox* checkbox{};
     QSlider* slider{};
     QComboBox* combobox{};
+    QDateTimeEdit* date_time_edit{};
 
 private:
     void CreateCheckBox(const QString& label, std::function<void()>& load_func);
     void CreateCheckBoxWithLineEdit(const QString& label, Settings::BasicSetting* other_setting,
                                     std::function<void()>& load_func);
+    void CreateCheckBoxWithHexEdit(const QString& label, Settings::BasicSetting* other_setting,
+                                   std::function<void()>& load_func);
     void CreateCheckBoxWithSpinBox(const QString& label, Settings::BasicSetting* other_setting,
-                                   std::function<void()>& load_func, const QString& suffix);
+                                   std::function<void()>& load_func, const std::string& suffix);
+    void CreateCheckBoxWithDateTimeEdit(const QString& label, Settings::BasicSetting* other_setting,
+                                        std::function<void()>& load_func);
     void CreateCombobox(const QString& label, bool managed, std::function<void()>& load_func);
     void CreateLineEdit(const QString& label, bool managed, std::function<void()>& load_func);
     void CreateSlider(const QString& label, bool reversed, float multiplier,
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index f8cbf8034..c42d98709 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -229,6 +229,7 @@ void Config::ReadValues() {
     ReadCategory(Settings::Category::RendererAdvanced);
     ReadCategory(Settings::Category::RendererDebug);
     ReadCategory(Settings::Category::System);
+    ReadCategory(Settings::Category::SystemAudio);
     ReadCategory(Settings::Category::DataStorage);
     ReadCategory(Settings::Category::Debugging);
     ReadCategory(Settings::Category::DebuggingGraphics);
-- 
cgit v1.2.3


From 4c4bc134a90a248435786b1dff4f514d1c9c4464 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Fri, 9 Jun 2023 16:53:01 -0400
Subject: settings, uisettings: Initialize linkage counter

---
 src/common/settings.cpp | 2 +-
 src/common/settings.h   | 2 +-
 src/yuzu/uisettings.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 605fe7f86..c8651925e 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -144,7 +144,7 @@ float Volume() {
     return values.volume.GetValue() / static_cast<f32>(values.volume.GetDefault());
 }
 
-Linkage::Linkage() = default;
+Linkage::Linkage(u32 initial_count) : count{initial_count} {}
 Linkage::~Linkage() = default;
 
 const char* TranslateCategory(Category category) {
diff --git a/src/common/settings.h b/src/common/settings.h
index 1f95bd7d5..51708706b 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -291,7 +291,7 @@ public:
 
 class Linkage {
 public:
-    explicit Linkage();
+    explicit Linkage(u32 initial_count = 0);
     ~Linkage();
     std::map<Category, std::forward_list<BasicSetting*>> by_category{};
     std::vector<std::function<void()>> restore_functions{};
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 9e2cea4d6..a734513ea 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -59,7 +59,7 @@ struct GameDir {
 };
 
 struct Values {
-    Settings::Linkage linkage{};
+    Settings::Linkage linkage{1000};
 
     QByteArray geometry;
     QByteArray state;
-- 
cgit v1.2.3


From 88d3de4e85751b32faa577345a828994575d2eb1 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 6 Jun 2023 01:31:43 -0400
Subject: settings: Split enums to new file

---
 src/common/CMakeLists.txt   |   1 +
 src/common/settings.h       | 189 +----------------------------------
 src/common/settings_enums.h | 237 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 241 insertions(+), 186 deletions(-)
 create mode 100644 src/common/settings_enums.h

(limited to 'src/common')

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3adf13a3f..5902dd617 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -110,6 +110,7 @@ add_library(common STATIC
     scratch_buffer.h
     settings.cpp
     settings.h
+    settings_enums.h
     settings_input.cpp
     settings_input.h
     socket_types.h
diff --git a/src/common/settings.h b/src/common/settings.h
index 51708706b..0ac5078c6 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -16,194 +16,11 @@
 #include <vector>
 
 #include "common/common_types.h"
+#include "common/settings_enums.h"
 #include "common/settings_input.h"
 
 namespace Settings {
 
-enum class Language : u32 {
-    Japanese,
-    EnglishAmerican,
-    French,
-    German,
-    Italian,
-    Spanish,
-    Chinese,
-    Korean,
-    Dutch,
-    Portuguese,
-    Russian,
-    Taiwanese,
-    EnglishBritish,
-    FrenchCanadian,
-    SpanishLatin,
-    ChineseSimplified,
-    ChineseTraditional,
-    PortugueseBrazilian,
-};
-
-enum class Region : u32 {
-    Japan,
-    USA,
-    Europe,
-    Australia,
-    China,
-    Korea,
-    Taiwan,
-};
-
-enum class TimeZone : u32 {
-    Auto,
-    Default,
-    CET,
-    CST6CDT,
-    Cuba,
-    EET,
-    Egypt,
-    Eire,
-    EST,
-    EST5EDT,
-    GB,
-    GBEire,
-    GMT,
-    GMTPlusZero,
-    GMTMinusZero,
-    GMTZero,
-    Greenwich,
-    Hongkong,
-    HST,
-    Iceland,
-    Iran,
-    Israel,
-    Jamaica,
-    Japan,
-    Kwajalein,
-    Libya,
-    MET,
-    MST,
-    MST7MDT,
-    Navajo,
-    NZ,
-    NZCHAT,
-    Poland,
-    Portugal,
-    PRC,
-    PST8PDT,
-    ROC,
-    ROK,
-    Singapore,
-    Turkey,
-    UCT,
-    Universal,
-    UTC,
-    W_SU,
-    WET,
-    Zulu,
-};
-
-enum class AnisotropyMode : u32 {
-    Automatic = 0,
-    Default = 1,
-    X2 = 2,
-    X4 = 3,
-    X8 = 4,
-    X16 = 5,
-};
-
-enum class AstcDecodeMode : u32 {
-    CPU = 0,
-    GPU = 1,
-    CPUAsynchronous = 2,
-};
-
-enum class VSyncMode : u32 {
-    Immediate = 0,
-    Mailbox = 1,
-    FIFO = 2,
-    FIFORelaxed = 3,
-};
-
-enum class RendererBackend : u32 {
-    OpenGL = 0,
-    Vulkan = 1,
-    Null = 2,
-};
-
-enum class ShaderBackend : u32 {
-    GLSL = 0,
-    GLASM = 1,
-    SPIRV = 2,
-};
-
-enum class GPUAccuracy : u32 {
-    Normal = 0,
-    High = 1,
-    Extreme = 2,
-    MaxEnum = 3,
-};
-
-enum class CPUAccuracy : u32 {
-    Auto = 0,
-    Accurate = 1,
-    Unsafe = 2,
-    Paranoid = 3,
-};
-
-enum class FullscreenMode : u32 {
-    Borderless = 0,
-    Exclusive = 1,
-};
-
-enum class NvdecEmulation : u32 {
-    Off = 0,
-    CPU = 1,
-    GPU = 2,
-};
-
-enum class ResolutionSetup : u32 {
-    Res1_2X = 0,
-    Res3_4X = 1,
-    Res1X = 2,
-    Res3_2X = 3,
-    Res2X = 4,
-    Res3X = 5,
-    Res4X = 6,
-    Res5X = 7,
-    Res6X = 8,
-    Res7X = 9,
-    Res8X = 10,
-};
-
-enum class ScalingFilter : u32 {
-    NearestNeighbor = 0,
-    Bilinear = 1,
-    Bicubic = 2,
-    Gaussian = 3,
-    ScaleForce = 4,
-    Fsr = 5,
-    LastFilter = Fsr,
-};
-
-enum class AntiAliasing : u32 {
-    None = 0,
-    Fxaa = 1,
-    Smaa = 2,
-    LastAA = Smaa,
-};
-
-enum class AstcRecompression : u32 {
-    Uncompressed = 0,
-    Bc1 = 1,
-    Bc3 = 2,
-};
-
-enum class AspectRatio : u32 {
-    R16_9,
-    R4_3,
-    R21_9,
-    R16_10,
-    Stretch,
-};
-
 enum class Category : u32 {
     Audio,
     Core,
@@ -278,7 +95,7 @@ public:
     virtual std::string DefaultToString() const = 0;
     virtual bool Save() const = 0;
     virtual std::type_index TypeId() const = 0;
-    virtual bool IsEnum() const = 0;
+    virtual constexpr bool IsEnum() const = 0;
     virtual bool RuntimeModfiable() const = 0;
     virtual void SetGlobal(bool global) {}
     virtual constexpr u32 Id() const = 0;
@@ -406,7 +223,7 @@ public:
         return runtime_modifiable;
     }
 
-    [[nodiscard]] bool IsEnum() const override {
+    [[nodiscard]] constexpr bool IsEnum() const override {
         return std::is_enum<Type>::value;
     }
 
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
new file mode 100644
index 000000000..f48fb7bd4
--- /dev/null
+++ b/src/common/settings_enums.h
@@ -0,0 +1,237 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <type_traits>
+#include <typeindex>
+#include "common/common_types.h"
+
+namespace Settings {
+
+enum class AudioEngine : u32 {
+    Auto,
+    Cubeb,
+    Sdl2,
+    Null,
+};
+
+enum class AudioMode : u32 {
+    Mono,
+    Stereo,
+    Surround,
+};
+
+enum class Language : u32 {
+    Japanese,
+    EnglishAmerican,
+    French,
+    German,
+    Italian,
+    Spanish,
+    Chinese,
+    Korean,
+    Dutch,
+    Portuguese,
+    Russian,
+    Taiwanese,
+    EnglishBritish,
+    FrenchCanadian,
+    SpanishLatin,
+    ChineseSimplified,
+    ChineseTraditional,
+    PortugueseBrazilian,
+};
+
+enum class Region : u32 {
+    Japan,
+    USA,
+    Europe,
+    Australia,
+    China,
+    Korea,
+    Taiwan,
+};
+
+enum class TimeZone : u32 {
+    Auto,
+    Default,
+    CET,
+    CST6CDT,
+    Cuba,
+    EET,
+    Egypt,
+    Eire,
+    EST,
+    EST5EDT,
+    GB,
+    GBEire,
+    GMT,
+    GMTPlusZero,
+    GMTMinusZero,
+    GMTZero,
+    Greenwich,
+    Hongkong,
+    HST,
+    Iceland,
+    Iran,
+    Israel,
+    Jamaica,
+    Japan,
+    Kwajalein,
+    Libya,
+    MET,
+    MST,
+    MST7MDT,
+    Navajo,
+    NZ,
+    NZCHAT,
+    Poland,
+    Portugal,
+    PRC,
+    PST8PDT,
+    ROC,
+    ROK,
+    Singapore,
+    Turkey,
+    UCT,
+    Universal,
+    UTC,
+    W_SU,
+    WET,
+    Zulu,
+};
+
+enum class AnisotropyMode : u32 {
+    Automatic = 0,
+    Default = 1,
+    X2 = 2,
+    X4 = 3,
+    X8 = 4,
+    X16 = 5,
+};
+
+enum class AstcDecodeMode : u32 {
+    CPU = 0,
+    GPU = 1,
+    CPUAsynchronous = 2,
+};
+
+enum class AstcRecompression : u32 {
+    Uncompressed = 0,
+    Bc1 = 1,
+    Bc3 = 2,
+};
+
+enum class VSyncMode : u32 {
+    Immediate = 0,
+    Mailbox = 1,
+    FIFO = 2,
+    FIFORelaxed = 3,
+};
+
+enum class RendererBackend : u32 {
+    OpenGL = 0,
+    Vulkan = 1,
+    Null = 2,
+};
+
+enum class ShaderBackend : u32 {
+    GLSL = 0,
+    GLASM = 1,
+    SPIRV = 2,
+};
+
+enum class GPUAccuracy : u32 {
+    Normal = 0,
+    High = 1,
+    Extreme = 2,
+    MaxEnum = 3,
+};
+
+enum class CPUAccuracy : u32 {
+    Auto = 0,
+    Accurate = 1,
+    Unsafe = 2,
+    Paranoid = 3,
+};
+
+enum class FullscreenMode : u32 {
+    Borderless = 0,
+    Exclusive = 1,
+};
+
+enum class NvdecEmulation : u32 {
+    Off = 0,
+    CPU = 1,
+    GPU = 2,
+};
+
+enum class ResolutionSetup : u32 {
+    Res1_2X = 0,
+    Res3_4X = 1,
+    Res1X = 2,
+    Res3_2X = 3,
+    Res2X = 4,
+    Res3X = 5,
+    Res4X = 6,
+    Res5X = 7,
+    Res6X = 8,
+    Res7X = 9,
+    Res8X = 10,
+};
+
+enum class ScalingFilter : u32 {
+    NearestNeighbor = 0,
+    Bilinear = 1,
+    Bicubic = 2,
+    Gaussian = 3,
+    ScaleForce = 4,
+    Fsr = 5,
+    LastFilter = Fsr,
+};
+
+enum class AntiAliasing : u32 {
+    None = 0,
+    Fxaa = 1,
+    Smaa = 2,
+    LastAA = Smaa,
+};
+
+enum class AspectRatio : u32 {
+    R16_9,
+    R4_3,
+    R21_9,
+    R16_10,
+    Stretch,
+};
+
+static std::map<std::type_index, std::map<std::string, u32>> translations = {
+    {typeid(AudioEngine),
+     {
+         {"auto", static_cast<u32>(AudioEngine::Auto)},
+         {"cubeb", static_cast<u32>(AudioEngine::Cubeb)},
+         {"sdl2", static_cast<u32>(AudioEngine::Sdl2)},
+         {"null", static_cast<u32>(AudioEngine::Null)},
+     }}};
+
+static std::string empty_string{};
+
+template <typename Type>
+const std::string& TranslateEnum(Type id) {
+    auto& group = translations.at(typeid(Type));
+    for (auto& [name, value] : group) {
+        if (static_cast<Type>(value) == id) {
+            return name;
+        }
+    }
+    return empty_string;
+}
+
+template <typename Type>
+static Type ToEnum(const std::string& text) {
+    return static_cast<Type>(translations.at(typeid(Type)).at(text));
+}
+} // namespace Settings
-- 
cgit v1.2.3


From 432f68ad29df7a368ba375d75d667c954e9c80b9 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Thu, 18 May 2023 17:54:22 -0400
Subject: configure_audio: Implement ui generation

Needs a considerable amount of management specific to some of
the comoboboxes due to the audio engine configuration.

general: Partial audio config implmentation

configure_audio: Implement ui generation

Needs a considerable amount of management specific to some of
the comoboboxes due to the audio engine configuration.

general: Partial audio config implmentation

settings: Make audio settings as enums
---
 src/audio_core/sink/sink_details.cpp          |  33 +++--
 src/audio_core/sink/sink_details.h            |   9 +-
 src/common/settings.cpp                       |   2 +-
 src/common/settings.h                         |  11 +-
 src/core/telemetry_session.cpp                |   3 +-
 src/yuzu/configuration/configure_audio.cpp    | 204 ++++++++++++--------------
 src/yuzu/configuration/configure_audio.h      |  16 +-
 src/yuzu/configuration/configure_audio.ui     | 162 +-------------------
 src/yuzu/configuration/configure_dialog.cpp   |   2 +-
 src/yuzu/configuration/configure_graphics.cpp |   8 +-
 src/yuzu/configuration/configure_per_game.cpp |   2 +-
 src/yuzu/configuration/shared_translation.cpp |   7 +
 src/yuzu/configuration/shared_widget.cpp      |  78 ++++++----
 src/yuzu/configuration/shared_widget.h        |  11 +-
 14 files changed, 219 insertions(+), 329 deletions(-)

(limited to 'src/common')

diff --git a/src/audio_core/sink/sink_details.cpp b/src/audio_core/sink/sink_details.cpp
index 39ea6d91b..751e97bfc 100644
--- a/src/audio_core/sink/sink_details.cpp
+++ b/src/audio_core/sink/sink_details.cpp
@@ -15,6 +15,7 @@
 #endif
 #include "audio_core/sink/null_sink.h"
 #include "common/logging/log.h"
+#include "common/settings_enums.h"
 
 namespace AudioCore::Sink {
 namespace {
@@ -24,7 +25,7 @@ struct SinkDetails {
     using LatencyFn = u32 (*)();
 
     /// Name for this sink.
-    std::string_view id;
+    Settings::AudioEngine id;
     /// A method to call to construct an instance of this type of sink.
     FactoryFn factory;
     /// A method to call to list available devices.
@@ -37,7 +38,7 @@ struct SinkDetails {
 constexpr SinkDetails sink_details[] = {
 #ifdef HAVE_CUBEB
     SinkDetails{
-        "cubeb",
+        Settings::AudioEngine::Cubeb,
         [](std::string_view device_id) -> std::unique_ptr<Sink> {
             return std::make_unique<CubebSink>(device_id);
         },
@@ -47,7 +48,7 @@ constexpr SinkDetails sink_details[] = {
 #endif
 #ifdef HAVE_SDL2
     SinkDetails{
-        "sdl2",
+        Settings::AudioEngine::Sdl2,
         [](std::string_view device_id) -> std::unique_ptr<Sink> {
             return std::make_unique<SDLSink>(device_id);
         },
@@ -55,46 +56,46 @@ constexpr SinkDetails sink_details[] = {
         &GetSDLLatency,
     },
 #endif
-    SinkDetails{"null",
+    SinkDetails{Settings::AudioEngine::Null,
                 [](std::string_view device_id) -> std::unique_ptr<Sink> {
                     return std::make_unique<NullSink>(device_id);
                 },
                 [](bool capture) { return std::vector<std::string>{"null"}; }, []() { return 0u; }},
 };
 
-const SinkDetails& GetOutputSinkDetails(std::string_view sink_id) {
-    const auto find_backend{[](std::string_view id) {
+const SinkDetails& GetOutputSinkDetails(Settings::AudioEngine sink_id) {
+    const auto find_backend{[](Settings::AudioEngine id) {
         return std::find_if(std::begin(sink_details), std::end(sink_details),
                             [&id](const auto& sink_detail) { return sink_detail.id == id; });
     }};
 
     auto iter = find_backend(sink_id);
 
-    if (sink_id == "auto") {
+    if (sink_id == Settings::AudioEngine::Auto) {
         // Auto-select a backend. Prefer CubeB, but it may report a large minimum latency which
         // causes audio issues, in that case go with SDL.
 #if defined(HAVE_CUBEB) && defined(HAVE_SDL2)
-        iter = find_backend("cubeb");
+        iter = find_backend(Settings::AudioEngine::Cubeb);
         if (iter->latency() > TargetSampleCount * 3) {
-            iter = find_backend("sdl2");
+            iter = find_backend(Settings::AudioEngine::Sdl2);
         }
 #else
         iter = std::begin(sink_details);
 #endif
-        LOG_INFO(Service_Audio, "Auto-selecting the {} backend", iter->id);
+        LOG_INFO(Service_Audio, "Auto-selecting the {} backend", Settings::TranslateEnum(iter->id));
     }
 
     if (iter == std::end(sink_details)) {
-        LOG_ERROR(Audio, "Invalid sink_id {}", sink_id);
-        iter = find_backend("null");
+        LOG_ERROR(Audio, "Invalid sink_id {}", Settings::TranslateEnum(sink_id));
+        iter = find_backend(Settings::AudioEngine::Null);
     }
 
     return *iter;
 }
 } // Anonymous namespace
 
-std::vector<std::string_view> GetSinkIDs() {
-    std::vector<std::string_view> sink_ids(std::size(sink_details));
+std::vector<Settings::AudioEngine> GetSinkIDs() {
+    std::vector<Settings::AudioEngine> sink_ids(std::size(sink_details));
 
     std::transform(std::begin(sink_details), std::end(sink_details), std::begin(sink_ids),
                    [](const auto& sink) { return sink.id; });
@@ -102,11 +103,11 @@ std::vector<std::string_view> GetSinkIDs() {
     return sink_ids;
 }
 
-std::vector<std::string> GetDeviceListForSink(std::string_view sink_id, bool capture) {
+std::vector<std::string> GetDeviceListForSink(Settings::AudioEngine sink_id, bool capture) {
     return GetOutputSinkDetails(sink_id).list_devices(capture);
 }
 
-std::unique_ptr<Sink> CreateSinkFromID(std::string_view sink_id, std::string_view device_id) {
+std::unique_ptr<Sink> CreateSinkFromID(Settings::AudioEngine sink_id, std::string_view device_id) {
     return GetOutputSinkDetails(sink_id).factory(device_id);
 }
 
diff --git a/src/audio_core/sink/sink_details.h b/src/audio_core/sink/sink_details.h
index e75932898..44403db71 100644
--- a/src/audio_core/sink/sink_details.h
+++ b/src/audio_core/sink/sink_details.h
@@ -7,6 +7,9 @@
 #include <string_view>
 #include <vector>
 
+namespace Settings {
+enum class AudioEngine : u32;
+}
 namespace AudioCore {
 class AudioManager;
 
@@ -19,7 +22,7 @@ class Sink;
  *
  * @return Vector of available sink names.
  */
-std::vector<std::string_view> GetSinkIDs();
+std::vector<Settings::AudioEngine> GetSinkIDs();
 
 /**
  * Gets the list of devices for a particular sink identified by the given ID.
@@ -28,7 +31,7 @@ std::vector<std::string_view> GetSinkIDs();
  * @param capture - Get capture (input) devices, or output devices?
  * @return Vector of device names.
  */
-std::vector<std::string> GetDeviceListForSink(std::string_view sink_id, bool capture);
+std::vector<std::string> GetDeviceListForSink(Settings::AudioEngine sink_id, bool capture);
 
 /**
  * Creates an audio sink identified by the given device ID.
@@ -37,7 +40,7 @@ std::vector<std::string> GetDeviceListForSink(std::string_view sink_id, bool cap
  * @param device_id - Name of the device to create.
  * @return Pointer to the created sink.
  */
-std::unique_ptr<Sink> CreateSinkFromID(std::string_view sink_id, std::string_view device_id);
+std::unique_ptr<Sink> CreateSinkFromID(Settings::AudioEngine sink_id, std::string_view device_id);
 
 } // namespace Sink
 } // namespace AudioCore
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index c8651925e..8bfda5667 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -90,7 +90,7 @@ void LogSettings() {
     log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue());
     log_setting("Renderer_UseAsynchronousShaders", values.use_asynchronous_shaders.GetValue());
     log_setting("Renderer_AnisotropicFilteringLevel", values.max_anisotropy.GetValue());
-    log_setting("Audio_OutputEngine", values.sink_id.GetValue());
+    log_setting("Audio_OutputEngine", Settings::TranslateEnum(values.sink_id.GetValue()));
     log_setting("Audio_OutputDevice", values.audio_output_device_id.GetValue());
     log_setting("Audio_InputDevice", values.audio_input_device_id.GetValue());
     log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd.GetValue());
diff --git a/src/common/settings.h b/src/common/settings.h
index 0ac5078c6..d4b41a162 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -244,6 +244,8 @@ protected:
             return value_.has_value() ? std::to_string(*value_) : "none";
         } else if constexpr (std::is_same<Type, bool>()) {
             return value_ ? "true" : "false";
+        } else if (std::is_same<Type, AudioEngine>()) {
+            return TranslateEnum(value_);
         } else {
             return std::to_string(static_cast<u64>(value_));
         }
@@ -309,6 +311,8 @@ public:
                 this->SetValue(static_cast<u32>(std::stoul(input)));
             } else if constexpr (std::is_same<Type, bool>()) {
                 this->SetValue(input == "true");
+            } else if constexpr (std::is_same<Type, AudioEngine>()) {
+                this->SetValue(ToEnum<Type>(input));
             } else {
                 this->SetValue(static_cast<Type>(std::stoll(input)));
             }
@@ -542,7 +546,7 @@ struct Values {
     Linkage linkage{};
 
     // Audio
-    Setting<std::string> sink_id{linkage, "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_input_device_id{linkage, "auto", "input_device", Category::Audio};
     Setting<bool, false> audio_muted{linkage, false, "audio_muted", Category::Audio, false};
@@ -731,8 +735,9 @@ struct Values {
     SwitchableSetting<TimeZone, true> time_zone_index{linkage,           TimeZone::Auto,
                                                       TimeZone::Auto,    TimeZone::Zulu,
                                                       "time_zone_index", Category::System};
-    SwitchableSetting<s32, true> sound_index{
-        linkage, 1, 0, 2, "sound_index", Category::SystemAudio};
+    SwitchableSetting<AudioMode, true> sound_index{linkage,         AudioMode::Stereo,
+                                                   AudioMode::Mono, AudioMode::Surround,
+                                                   "sound_index",   Category::SystemAudio};
 
     SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System};
 
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index a3505a505..c058ac2c7 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -254,7 +254,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader,
 
     // Log user configuration information
     constexpr auto field_type = Telemetry::FieldType::UserConfig;
-    AddField(field_type, "Audio_SinkId", Settings::values.sink_id.GetValue());
+    AddField(field_type, "Audio_SinkId",
+             Settings::TranslateEnum(Settings::values.sink_id.GetValue()));
     AddField(field_type, "Core_UseMultiCore", Settings::values.use_multi_core.GetValue());
     AddField(field_type, "Renderer_Backend",
              TranslateRenderer(Settings::values.renderer_backend.GetValue()));
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 335662144..dd9eb4dc1 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <forward_list>
 #include <memory>
 
 #include "audio_core/sink/sink.h"
@@ -10,80 +11,105 @@
 #include "ui_configure_audio.h"
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_audio.h"
+#include "yuzu/configuration/shared_translation.h"
+#include "yuzu/configuration/shared_widget.h"
 #include "yuzu/uisettings.h"
 
 ConfigureAudio::ConfigureAudio(const Core::System& system_,
                                std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                               const ConfigurationShared::TranslationMap& translations_,
                                QWidget* parent)
-    : Tab(group, parent), ui(std::make_unique<Ui::ConfigureAudio>()), system{system_} {
+    : Tab(group, parent),
+      ui(std::make_unique<Ui::ConfigureAudio>()), system{system_}, translations{translations_} {
     ui->setupUi(this);
+    Setup();
 
-    InitializeAudioSinkComboBox();
+    SetConfiguration();
+}
 
-    connect(ui->volume_slider, &QSlider::valueChanged, this,
-            &ConfigureAudio::SetVolumeIndicatorText);
-    connect(ui->sink_combo_box, qOverload<int>(&QComboBox::currentIndexChanged), this,
-            &ConfigureAudio::UpdateAudioDevices);
+ConfigureAudio::~ConfigureAudio() = default;
 
-    ui->volume_label->setVisible(Settings::IsConfiguringGlobal());
-    ui->volume_combo_box->setVisible(!Settings::IsConfiguringGlobal());
+void ConfigureAudio::Setup() {
+    const bool runtime_lock = !system.IsPoweredOn();
+    auto& layout = *ui->audio_widget->layout();
 
-    SetupPerGameUI();
+    std::forward_list<Settings::BasicSetting*> settings;
 
-    SetConfiguration();
+    auto push = [&](Settings::Category category) {
+        for (auto* setting : Settings::values.linkage.by_category[category]) {
+            settings.push_front(setting);
+        }
+    };
+
+    push(Settings::Category::Audio);
+    push(Settings::Category::SystemAudio);
+
+    for (auto* setting : settings) {
+        auto* widget = [&]() {
+            if (setting->Id() == Settings::values.volume.Id()) {
+                return new ConfigurationShared::Widget(
+                    setting, translations, this, runtime_lock, apply_funcs,
+                    ConfigurationShared::RequestType::Slider, true, 1.0f, nullptr,
+                    tr("%1%", "Volume percentage (e.g. 50%)"));
+            } else if (setting->Id() == Settings::values.audio_output_device_id.Id() ||
+                       setting->Id() == Settings::values.audio_input_device_id.Id() ||
+                       setting->Id() == Settings::values.sink_id.Id()) {
+                return new ConfigurationShared::Widget(
+                    setting, translations, this, runtime_lock, apply_funcs,
+                    ConfigurationShared::RequestType::ComboBox, false);
+            } else {
+                return new ConfigurationShared::Widget(setting, translations, this, runtime_lock,
+                                                       apply_funcs);
+            }
+        }();
+
+        if (!widget->Valid()) {
+            delete widget;
+            continue;
+        }
 
-    const bool is_powered_on = system_.IsPoweredOn();
-    ui->sink_combo_box->setEnabled(!is_powered_on);
-    ui->output_combo_box->setEnabled(!is_powered_on);
-    ui->input_combo_box->setEnabled(!is_powered_on);
-}
+        layout.addWidget(widget);
 
-ConfigureAudio::~ConfigureAudio() = default;
+        if (setting->Id() == Settings::values.sink_id.Id()) {
+            sink_combo_box = widget->combobox;
+            InitializeAudioSinkComboBox();
+
+            connect(sink_combo_box, qOverload<int>(&QComboBox::currentIndexChanged), this,
+                    &ConfigureAudio::UpdateAudioDevices);
+        } else if (setting->Id() == Settings::values.audio_output_device_id.Id()) {
+            output_device_combo_box = widget->combobox;
+        } else if (setting->Id() == Settings::values.audio_input_device_id.Id()) {
+            input_device_combo_box = widget->combobox;
+        }
+    }
+}
 
 void ConfigureAudio::SetConfiguration() {
+    if (!Settings::IsConfiguringGlobal()) {
+        return;
+    }
+
     SetOutputSinkFromSinkID();
 
     // The device list cannot be pre-populated (nor listed) until the output sink is known.
-    UpdateAudioDevices(ui->sink_combo_box->currentIndex());
+    UpdateAudioDevices(sink_combo_box->currentIndex());
 
     SetAudioDevicesFromDeviceID();
-
-    const auto volume_value = static_cast<int>(Settings::values.volume.GetValue());
-    ui->volume_slider->setValue(volume_value);
-    ui->toggle_background_mute->setChecked(UISettings::values.mute_when_in_background.GetValue());
-
-    if (!Settings::IsConfiguringGlobal()) {
-        if (Settings::values.volume.UsingGlobal()) {
-            ui->volume_combo_box->setCurrentIndex(0);
-            ui->volume_slider->setEnabled(false);
-        } else {
-            ui->volume_combo_box->setCurrentIndex(1);
-            ui->volume_slider->setEnabled(true);
-        }
-        ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index);
-        ConfigurationShared::SetHighlight(ui->mode_label,
-                                          !Settings::values.sound_index.UsingGlobal());
-        ConfigurationShared::SetHighlight(ui->volume_layout,
-                                          !Settings::values.volume.UsingGlobal());
-    } else {
-        ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue());
-    }
-    SetVolumeIndicatorText(ui->volume_slider->sliderPosition());
 }
 
 void ConfigureAudio::SetOutputSinkFromSinkID() {
-    [[maybe_unused]] const QSignalBlocker blocker(ui->sink_combo_box);
+    [[maybe_unused]] const QSignalBlocker blocker(sink_combo_box);
 
     int new_sink_index = 0;
-    const QString sink_id = QString::fromStdString(Settings::values.sink_id.GetValue());
-    for (int index = 0; index < ui->sink_combo_box->count(); index++) {
-        if (ui->sink_combo_box->itemText(index) == sink_id) {
+    const QString sink_id = QString::fromStdString(Settings::values.sink_id.ToString());
+    for (int index = 0; index < sink_combo_box->count(); index++) {
+        if (sink_combo_box->itemText(index) == sink_id) {
             new_sink_index = index;
             break;
         }
     }
 
-    ui->sink_combo_box->setCurrentIndex(new_sink_index);
+    sink_combo_box->setCurrentIndex(new_sink_index);
 }
 
 void ConfigureAudio::SetAudioDevicesFromDeviceID() {
@@ -91,57 +117,42 @@ void ConfigureAudio::SetAudioDevicesFromDeviceID() {
 
     const QString output_device_id =
         QString::fromStdString(Settings::values.audio_output_device_id.GetValue());
-    for (int index = 0; index < ui->output_combo_box->count(); index++) {
-        if (ui->output_combo_box->itemText(index) == output_device_id) {
+    for (int index = 0; index < output_device_combo_box->count(); index++) {
+        if (output_device_combo_box->itemText(index) == output_device_id) {
             new_device_index = index;
             break;
         }
     }
 
-    ui->output_combo_box->setCurrentIndex(new_device_index);
+    output_device_combo_box->setCurrentIndex(new_device_index);
 
     new_device_index = -1;
     const QString input_device_id =
         QString::fromStdString(Settings::values.audio_input_device_id.GetValue());
-    for (int index = 0; index < ui->input_combo_box->count(); index++) {
-        if (ui->input_combo_box->itemText(index) == input_device_id) {
+    for (int index = 0; index < input_device_combo_box->count(); index++) {
+        if (input_device_combo_box->itemText(index) == input_device_id) {
             new_device_index = index;
             break;
         }
     }
 
-    ui->input_combo_box->setCurrentIndex(new_device_index);
-}
-
-void ConfigureAudio::SetVolumeIndicatorText(int percentage) {
-    ui->volume_indicator->setText(tr("%1%", "Volume percentage (e.g. 50%)").arg(percentage));
+    input_device_combo_box->setCurrentIndex(new_device_index);
 }
 
 void ConfigureAudio::ApplyConfiguration() {
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.sound_index, ui->combo_sound);
+    const bool is_powered_on = system.IsPoweredOn();
+    for (const auto& apply_func : apply_funcs) {
+        apply_func(is_powered_on);
+    }
 
     if (Settings::IsConfiguringGlobal()) {
-        Settings::values.sink_id =
-            ui->sink_combo_box->itemText(ui->sink_combo_box->currentIndex()).toStdString();
+        Settings::values.sink_id.LoadString(
+            sink_combo_box->itemText(sink_combo_box->currentIndex()).toStdString());
         Settings::values.audio_output_device_id.SetValue(
-            ui->output_combo_box->itemText(ui->output_combo_box->currentIndex()).toStdString());
+            output_device_combo_box->itemText(output_device_combo_box->currentIndex())
+                .toStdString());
         Settings::values.audio_input_device_id.SetValue(
-            ui->input_combo_box->itemText(ui->input_combo_box->currentIndex()).toStdString());
-        UISettings::values.mute_when_in_background = ui->toggle_background_mute->isChecked();
-
-        // Guard if during game and set to game-specific value
-        if (Settings::values.volume.UsingGlobal()) {
-            const auto volume = static_cast<u8>(ui->volume_slider->value());
-            Settings::values.volume.SetValue(volume);
-        }
-    } else {
-        if (ui->volume_combo_box->currentIndex() == 0) {
-            Settings::values.volume.SetGlobal(true);
-        } else {
-            Settings::values.volume.SetGlobal(false);
-            const auto volume = static_cast<u8>(ui->volume_slider->value());
-            Settings::values.volume.SetValue(volume);
-        }
+            input_device_combo_box->itemText(input_device_combo_box->currentIndex()).toStdString());
     }
 }
 
@@ -154,54 +165,31 @@ void ConfigureAudio::changeEvent(QEvent* event) {
 }
 
 void ConfigureAudio::UpdateAudioDevices(int sink_index) {
-    ui->output_combo_box->clear();
-    ui->output_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
+    output_device_combo_box->clear();
+    output_device_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
 
-    const std::string sink_id = ui->sink_combo_box->itemText(sink_index).toStdString();
+    const auto sink_id =
+        Settings::ToEnum<Settings::AudioEngine>(sink_combo_box->itemText(sink_index).toStdString());
     for (const auto& device : AudioCore::Sink::GetDeviceListForSink(sink_id, false)) {
-        ui->output_combo_box->addItem(QString::fromStdString(device));
+        output_device_combo_box->addItem(QString::fromStdString(device));
     }
 
-    ui->input_combo_box->clear();
-    ui->input_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
+    input_device_combo_box->clear();
+    input_device_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
     for (const auto& device : AudioCore::Sink::GetDeviceListForSink(sink_id, true)) {
-        ui->input_combo_box->addItem(QString::fromStdString(device));
+        input_device_combo_box->addItem(QString::fromStdString(device));
     }
 }
 
 void ConfigureAudio::InitializeAudioSinkComboBox() {
-    ui->sink_combo_box->clear();
-    ui->sink_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
+    sink_combo_box->clear();
+    sink_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
 
     for (const auto& id : AudioCore::Sink::GetSinkIDs()) {
-        ui->sink_combo_box->addItem(QString::fromUtf8(id.data(), static_cast<s32>(id.length())));
+        sink_combo_box->addItem(QString::fromStdString(Settings::TranslateEnum(id)));
     }
 }
 
 void ConfigureAudio::RetranslateUI() {
     ui->retranslateUi(this);
-    SetVolumeIndicatorText(ui->volume_slider->sliderPosition());
-}
-
-void ConfigureAudio::SetupPerGameUI() {
-    if (Settings::IsConfiguringGlobal()) {
-        ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal());
-        ui->volume_slider->setEnabled(Settings::values.volume.UsingGlobal());
-        return;
-    }
-
-    ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->mode_label,
-                                            Settings::values.sound_index.GetValue(true));
-
-    connect(ui->volume_combo_box, qOverload<int>(&QComboBox::activated), this, [this](int index) {
-        ui->volume_slider->setEnabled(index == 1);
-        ConfigurationShared::SetHighlight(ui->volume_layout, index == 1);
-    });
-
-    ui->sink_combo_box->setVisible(false);
-    ui->sink_label->setVisible(false);
-    ui->output_combo_box->setVisible(false);
-    ui->output_label->setVisible(false);
-    ui->input_combo_box->setVisible(false);
-    ui->input_label->setVisible(false);
 }
diff --git a/src/yuzu/configuration/configure_audio.h b/src/yuzu/configuration/configure_audio.h
index d134ac957..170e0bce8 100644
--- a/src/yuzu/configuration/configure_audio.h
+++ b/src/yuzu/configuration/configure_audio.h
@@ -3,9 +3,14 @@
 
 #pragma once
 
+#include <forward_list>
+#include <functional>
 #include <memory>
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
+#include "yuzu/configuration/shared_translation.h"
+
+class QPushButton;
 
 namespace Core {
 class System;
@@ -19,6 +24,7 @@ class ConfigureAudio : public ConfigurationShared::Tab {
 public:
     explicit ConfigureAudio(const Core::System& system_,
                             std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                            const ConfigurationShared::TranslationMap& translations_,
                             QWidget* parent = nullptr);
     ~ConfigureAudio() override;
 
@@ -36,11 +42,17 @@ private:
 
     void SetOutputSinkFromSinkID();
     void SetAudioDevicesFromDeviceID();
-    void SetVolumeIndicatorText(int percentage);
 
-    void SetupPerGameUI();
+    void Setup();
 
     std::unique_ptr<Ui::ConfigureAudio> ui;
 
     const Core::System& system;
+    const ConfigurationShared::TranslationMap& translations;
+
+    std::forward_list<std::function<void(bool)>> apply_funcs{};
+
+    QComboBox* sink_combo_box;
+    QComboBox* output_device_combo_box;
+    QComboBox* input_device_combo_box;
 };
diff --git a/src/yuzu/configuration/configure_audio.ui b/src/yuzu/configuration/configure_audio.ui
index 4128c83ad..1181aeb00 100644
--- a/src/yuzu/configuration/configure_audio.ui
+++ b/src/yuzu/configuration/configure_audio.ui
@@ -21,80 +21,14 @@
      </property>
      <layout class="QVBoxLayout">
       <item>
-       <layout class="QHBoxLayout" name="engine_layout">
-        <item>
-         <widget class="QLabel" name="sink_label">
-          <property name="text">
-           <string>Output Engine:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="sink_combo_box"/>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="output_layout">
-        <item>
-         <widget class="QLabel" name="output_label">
-          <property name="text">
-           <string>Output Device:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="output_combo_box"/>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="input_layout">
-        <item>
-         <widget class="QLabel" name="input_label">
-          <property name="text">
-           <string>Input Device:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="input_combo_box"/>
-        </item>
-       </layout>
-      </item>
-       <item>
-       <layout class="QHBoxLayout" name="mode_layout">
-        <item>
-         <widget class="QLabel" name="mode_label">
-          <property name="text">
-           <string>Sound Output Mode:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-          <widget class="QComboBox" name="combo_sound">
-            <item>
-              <property name="text">
-                <string>Mono</string>
-              </property>
-            </item>
-            <item>
-              <property name="text">
-                <string>Stereo</string>
-              </property>
-            </item>
-            <item>
-              <property name="text">
-                <string>Surround</string>
-              </property>
-            </item>
-          </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QWidget" name="volume_layout" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <widget class="QWidget" name="audio_widget" native="true">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777213</height>
+         </size>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -107,89 +41,9 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item>
-          <widget class="QComboBox" name="volume_combo_box">
-           <item>
-            <property name="text">
-             <string>Use global volume</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Set volume:</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="volume_label">
-           <property name="text">
-            <string>Volume:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>30</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QSlider" name="volume_slider">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximum">
-            <number>200</number>
-           </property>
-           <property name="pageStep">
-            <number>5</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="volume_indicator">
-           <property name="minimumSize">
-            <size>
-             <width>32</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>0 %</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="mute_layout">
-         <item>
-           <widget class="QCheckBox" name="toggle_background_mute">
-             <property name="text">
-               <string>Mute audio when in background</string>
-             </property>
-           </widget>
-         </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index 3a94fee9e..f0f00be83 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -34,7 +34,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
     : QDialog(parent), ui{std::make_unique<Ui::ConfigureDialog>()},
       registry(registry_), system{system_},
       translations{ConfigurationShared::InitializeTranslations(this)},
-      audio_tab{std::make_unique<ConfigureAudio>(system_, nullptr, this)},
+      audio_tab{std::make_unique<ConfigureAudio>(system_, nullptr, *translations, this)},
       cpu_tab{std::make_unique<ConfigureCpu>(system_, nullptr, this)},
       debug_tab_tab{std::make_unique<ConfigureDebugTab>(system_, this)},
       filesystem_tab{std::make_unique<ConfigureFilesystem>(this)},
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 2354323b8..45a4db430 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -240,12 +240,14 @@ void ConfigureGraphics::Setup() {
             } else if (setting->Id() == Settings::values.fsr_sharpening_slider.Id()) {
                 return new ConfigurationShared::Widget(
                     setting, translations, this, runtime_lock, apply_funcs,
-                    ConfigurationShared::RequestType::ReverseSlider, true, 0.5f);
+                    ConfigurationShared::RequestType::ReverseSlider, true, 0.5f, nullptr,
+                    tr("%1%", "FSR sharpening percentage (e.g. 50%)"));
             } else if (setting->Id() == Settings::values.speed_limit.Id()) {
                 return new ConfigurationShared::Widget(
                     setting, translations, this, runtime_lock, apply_funcs,
                     ConfigurationShared::RequestType::SpinBox, true, 1.0f,
-                    &Settings::values.use_speed_limit, "%");
+                    &Settings::values.use_speed_limit,
+                    tr("%", "Limit speed percentage (e.g. 50%)"));
             } else {
                 return new ConfigurationShared::Widget(setting, translations, this, runtime_lock,
                                                        apply_funcs);
@@ -304,7 +306,7 @@ void ConfigureGraphics::Setup() {
         });
     } else {
         QPushButton* bg_restore_button = ConfigurationShared::Widget::CreateRestoreGlobalButton(
-            Settings::values.bg_red, ui->bg_widget);
+            Settings::values.bg_red.UsingGlobal(), ui->bg_widget);
         ui->bg_widget->layout()->addWidget(bg_restore_button);
 
         QObject::connect(bg_restore_button, &QAbstractButton::clicked,
diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index c39855334..2ee0a8ffa 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -50,7 +50,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
     game_config = std::make_unique<Config>(config_file_name, Config::ConfigType::PerGameConfig);
 
     addons_tab = std::make_unique<ConfigurePerGameAddons>(system_, this);
-    audio_tab = std::make_unique<ConfigureAudio>(system_, tab_group, this);
+    audio_tab = std::make_unique<ConfigureAudio>(system_, tab_group, *translations, this);
     cpu_tab = std::make_unique<ConfigureCpu>(system_, tab_group, this);
     graphics_advanced_tab =
         std::make_unique<ConfigureGraphicsAdvanced>(system_, tab_group, *translations, this);
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 6038e8c25..c3b38f776 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -30,6 +30,7 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
     INSERT(Settings, audio_input_device_id, "Input Device:", "");
     INSERT(Settings, audio_muted, "Mute audio when in background", "");
     INSERT(Settings, volume, "Volume:", "");
+    INSERT(Settings, dump_audio_commands, "", "");
 
     // Core
     INSERT(Settings, use_multi_core, "Multicore CPU Emulation", "");
@@ -270,6 +271,12 @@ std::forward_list<QString> ComboboxEnumeration(std::type_index type, QWidget* pa
             tr("ROC"),     tr("ROK"),       tr("Singapore"), tr("Turkey"),    tr("UCT"),
             tr("W-SU"),    tr("WET"),       tr("Zulu"),
         };
+    } else if (type == typeid(Settings::AudioMode)) {
+        return {
+            tr("Mono"),
+            tr("Stereo"),
+            tr("Surround"),
+        };
     }
 
     return {};
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index f39e3fccb..d7b7ed164 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -24,7 +24,7 @@
 
 namespace ConfigurationShared {
 
-QPushButton* Widget::CreateRestoreGlobalButton(Settings::BasicSetting& setting, QWidget* parent) {
+QPushButton* Widget::CreateRestoreGlobalButton(bool using_global, QWidget* parent) {
     QStyle* style = parent->style();
     QIcon* icon = new QIcon(style->standardIcon(QStyle::SP_LineEditClearButton));
     QPushButton* restore_button = new QPushButton(*icon, QStringLiteral(""), parent);
@@ -34,8 +34,8 @@ QPushButton* Widget::CreateRestoreGlobalButton(Settings::BasicSetting& setting,
     sp_retain.setRetainSizeWhenHidden(true);
     restore_button->setSizePolicy(sp_retain);
 
-    restore_button->setEnabled(!setting.UsingGlobal());
-    restore_button->setVisible(!setting.UsingGlobal());
+    restore_button->setEnabled(!using_global);
+    restore_button->setVisible(!using_global);
 
     return restore_button;
 }
@@ -57,6 +57,10 @@ QHBoxLayout* Widget::CreateCheckBox(Settings::BasicSetting* bool_setting, const
                                                                : Qt::CheckState::Unchecked);
     checkbox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
+    if (!bool_setting->Save() && !Settings::IsConfiguringGlobal() && runtime_lock) {
+        checkbox->setEnabled(false);
+    }
+
     layout->addWidget(checkbox);
 
     layout->setContentsMargins(0, 0, 0, 0);
@@ -70,7 +74,8 @@ QHBoxLayout* Widget::CreateCheckBox(Settings::BasicSetting* bool_setting, const
             bool_setting->LoadString(checkbox->checkState() == Qt::Checked ? "true" : "false");
         };
     } else {
-        restore_button = CreateRestoreGlobalButton(*bool_setting, this);
+        restore_button =
+            CreateRestoreGlobalButton(bool_setting->UsingGlobal() && setting.UsingGlobal(), this);
         layout->addWidget(restore_button);
 
         QObject::connect(checkbox, &QCheckBox::stateChanged, [=](int) {
@@ -128,7 +133,7 @@ void Widget::CreateCombobox(const QString& label, std::function<void()>& load_fu
     if (Settings::IsConfiguringGlobal()) {
         load_func = [=]() { setting.LoadString(std::to_string(combobox->currentIndex())); };
     } else {
-        restore_button = CreateRestoreGlobalButton(setting, this);
+        restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this);
         layout->addWidget(restore_button);
 
         QObject::connect(restore_button, &QAbstractButton::clicked, [&](bool) {
@@ -194,7 +199,7 @@ void Widget::CreateLineEdit(const QString& label, std::function<void()>& load_fu
         };
     } else {
         if (!has_checkbox) {
-            restore_button = CreateRestoreGlobalButton(setting, this);
+            restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this);
             layout->addWidget(restore_button);
         }
 
@@ -223,7 +228,7 @@ void Widget::CreateLineEdit(const QString& label, std::function<void()>& load_fu
 }
 
 void Widget::CreateSlider(const QString& label, bool reversed, float multiplier,
-                          std::function<void()>& load_func, bool managed,
+                          std::function<void()>& load_func, bool managed, const QString& format,
                           Settings::BasicSetting* const other_setting) {
     created = true;
 
@@ -242,15 +247,16 @@ void Widget::CreateSlider(const QString& label, bool reversed, float multiplier,
 
     int max_val = std::stoi(setting.MaxVal());
 
+    const QString use_format = format == QStringLiteral("") ? QStringLiteral("%1") : format;
+
     QObject::connect(slider, &QAbstractSlider::valueChanged, [=](int value) {
-        int present = (reversed ? max_val - value : value) * multiplier;
-        feedback->setText(
-            QStringLiteral("%1%").arg(QString::fromStdString(std::to_string(present))));
+        int present = (reversed ? max_val - value : value) * multiplier + 0.5f;
+        feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
     });
 
-    slider->setValue(std::stoi(setting.ToString()));
     slider->setMinimum(std::stoi(setting.MinVal()));
     slider->setMaximum(max_val);
+    slider->setValue(std::stoi(setting.ToString()));
 
     slider->setInvertedAppearance(reversed);
 
@@ -261,7 +267,7 @@ void Widget::CreateSlider(const QString& label, bool reversed, float multiplier,
     if (Settings::IsConfiguringGlobal()) {
         load_func = [=]() { setting.LoadString(std::to_string(slider->value())); };
     } else {
-        restore_button = CreateRestoreGlobalButton(setting, this);
+        restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this);
         layout->addWidget(restore_button);
 
         QObject::connect(restore_button, &QAbstractButton::clicked, [=](bool) {
@@ -287,7 +293,7 @@ void Widget::CreateSlider(const QString& label, bool reversed, float multiplier,
 }
 
 void Widget::CreateSpinBox(const QString& label, std::function<void()>& load_func, bool managed,
-                           const std::string& suffix, Settings::BasicSetting* other_setting) {
+                           const QString& suffix, Settings::BasicSetting* other_setting) {
     const bool has_checkbox = other_setting != nullptr;
     if (has_checkbox && other_setting->TypeId() != typeid(bool)) {
         LOG_WARNING(Frontend, "Extra setting requested but setting is not boolean");
@@ -315,7 +321,7 @@ void Widget::CreateSpinBox(const QString& label, std::function<void()>& load_fun
     spinbox = new QSpinBox(this);
     spinbox->setRange(min_val, max_val);
     spinbox->setValue(default_val);
-    spinbox->setSuffix(QString::fromStdString(suffix));
+    spinbox->setSuffix(suffix);
     spinbox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
     layout->insertWidget(1, spinbox);
@@ -327,7 +333,8 @@ void Widget::CreateSpinBox(const QString& label, std::function<void()>& load_fun
         };
     } else {
         if (!has_checkbox) {
-            restore_button = CreateRestoreGlobalButton(setting, this);
+            restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this);
+            layout->addWidget(restore_button);
         }
 
         QObject::connect(restore_button, &QAbstractButton::clicked,
@@ -382,7 +389,7 @@ void Widget::CreateHexEdit(const QString& label, std::function<void()>& load_fun
             setting.LoadString(hex_to_dec());
         };
     } else {
-        restore_button = CreateRestoreGlobalButton(setting, this);
+        restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this);
         layout->addWidget(restore_button);
 
         QObject::connect(restore_button, &QAbstractButton::clicked, [=](bool) {
@@ -465,7 +472,7 @@ void Widget::CreateDateTimeEdit(const QString& label, std::function<void()>& loa
         };
     } else {
         if (!has_checkbox) {
-            restore_button = CreateRestoreGlobalButton(setting, this);
+            restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this);
             layout->addWidget(restore_button);
         }
 
@@ -515,12 +522,12 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
       apply_funcs{apply_funcs_} {}
 
 Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translations_,
-               QWidget* parent_, bool runtime_lock,
+               QWidget* parent_, bool runtime_lock_,
                std::forward_list<std::function<void(bool)>>& apply_funcs_, RequestType request,
                bool managed, float multiplier, Settings::BasicSetting* other_setting,
-               const std::string& string)
+               const QString& string)
     : QWidget(parent_), parent{parent_}, translations{translations_}, setting{*setting_},
-      apply_funcs{apply_funcs_} {
+      apply_funcs{apply_funcs_}, runtime_lock{runtime_lock_} {
     if (!Settings::IsConfiguringGlobal() && !setting.Switchable()) {
         LOG_DEBUG(Frontend, "\"{}\" is not switchable, skipping...", setting.GetLabel());
         return;
@@ -547,23 +554,16 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
     std::function<void()> load_func = []() {};
 
     if (type == typeid(bool)) {
-        switch (request) {
-        case RequestType::Default:
-            CreateCheckBox(&setting, label, load_func, managed);
-            break;
-        default:
-            LOG_WARNING(Frontend, "Requested widget is unimplemented.");
-            break;
-        }
+        CreateCheckBox(&setting, label, load_func, managed);
     } else if (setting.IsEnum()) {
         CreateCombobox(label, load_func, managed);
     } else if (type == typeid(u32) || type == typeid(int) || type == typeid(u16) ||
-               type == typeid(s64)) {
+               type == typeid(s64) || type == typeid(u8)) {
         switch (request) {
         case RequestType::Slider:
         case RequestType::ReverseSlider:
             CreateSlider(label, request == RequestType::ReverseSlider, multiplier, load_func,
-                         managed);
+                         managed, string);
             break;
         case RequestType::LineEdit:
         case RequestType::Default:
@@ -586,7 +586,23 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
             break;
         }
     } else if (type == typeid(std::string)) {
-        CreateLineEdit(label, load_func, managed);
+        switch (request) {
+        case RequestType::Default:
+        case RequestType::LineEdit:
+            CreateLineEdit(label, load_func, managed);
+            break;
+        case RequestType::ComboBox:
+            CreateCombobox(label, load_func, false);
+            break;
+        case RequestType::SpinBox:
+        case RequestType::Slider:
+        case RequestType::ReverseSlider:
+        case RequestType::HexEdit:
+        case RequestType::DateTimeEdit:
+        case RequestType::MaxEnum:
+            LOG_WARNING(Frontend, "Requested widget is unimplemented.");
+            break;
+        }
     }
 
     if (!created) {
diff --git a/src/yuzu/configuration/shared_widget.h b/src/yuzu/configuration/shared_widget.h
index c4e686574..331316040 100644
--- a/src/yuzu/configuration/shared_widget.h
+++ b/src/yuzu/configuration/shared_widget.h
@@ -38,15 +38,15 @@ public:
     Widget(Settings::BasicSetting* setting, const TranslationMap& translations, QWidget* parent,
            bool runtime_lock, std::forward_list<std::function<void(bool)>>& apply_funcs_,
            RequestType request = RequestType::Default, bool managed = true, float multiplier = 1.0f,
-           Settings::BasicSetting* other_setting = nullptr, const std::string& format = "");
+           Settings::BasicSetting* other_setting = nullptr,
+           const QString& string = QStringLiteral(""));
     Widget(Settings::BasicSetting* setting_, const TranslationMap& translations_, QWidget* parent_,
            std::forward_list<std::function<void(bool)>>& apply_funcs_);
     virtual ~Widget();
 
     bool Valid();
 
-    [[nodiscard]] static QPushButton* CreateRestoreGlobalButton(Settings::BasicSetting& setting,
-                                                                QWidget* parent);
+    [[nodiscard]] static QPushButton* CreateRestoreGlobalButton(bool using_global, QWidget* parent);
 
     QPushButton* restore_button{};
     QLineEdit* line_edit{};
@@ -68,12 +68,12 @@ private:
     void CreateHexEdit(const QString& label, std::function<void()>& load_func, bool managed,
                        Settings::BasicSetting* const other_setting = nullptr);
     void CreateSlider(const QString& label, bool reversed, float multiplier,
-                      std::function<void()>& load_func, bool managed,
+                      std::function<void()>& load_func, bool managed, const QString& format,
                       Settings::BasicSetting* const other_setting = nullptr);
     void CreateDateTimeEdit(const QString& label, std::function<void()>& load_func, bool managed,
                             bool restrict, Settings::BasicSetting* const other_setting = nullptr);
     void CreateSpinBox(const QString& label, std::function<void()>& load_func, bool managed,
-                       const std::string& suffix, Settings::BasicSetting* other_setting = nullptr);
+                       const QString& suffix, Settings::BasicSetting* other_setting = nullptr);
 
     QWidget* parent;
     const TranslationMap& translations;
@@ -81,6 +81,7 @@ private:
     std::forward_list<std::function<void(bool)>>& apply_funcs;
 
     bool created{false};
+    bool runtime_lock{false};
 };
 
 } // namespace ConfigurationShared
-- 
cgit v1.2.3


From 3281ea935ff66cef6fbfa1b83564fb4ac96918cc Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Thu, 18 May 2023 16:30:39 -0700
Subject: settings: Make volume runtime-configurable

---
 src/common/settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index d4b41a162..a9ce113ef 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -550,7 +550,7 @@ struct Values {
     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<bool, false> audio_muted{linkage, false, "audio_muted", Category::Audio, false};
-    SwitchableSetting<u8, true> volume{linkage, 100, 0, 200, "volume", Category::Audio};
+    SwitchableSetting<u8, true> volume{linkage, 100, 0, 200, "volume", Category::Audio, true, true};
     Setting<bool, false> dump_audio_commands{linkage, false, "dump_audio_commands", Category::Audio,
                                              false};
 
-- 
cgit v1.2.3


From d146dd9d123a999e40307a93403239b81b04bffc Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 7 Jun 2023 01:52:23 -0400
Subject: settings,general: Rename non-confirming enums

---
 src/audio_core/sink/sink_details.cpp               |  5 +--
 src/common/settings.cpp                            |  6 ++--
 src/common/settings.h                              | 40 +++++++++++++---------
 src/common/settings_enums.h                        | 37 ++++++++++----------
 src/core/arm/dynarmic/arm_dynarmic_32.cpp          |  6 ++--
 src/core/arm/dynarmic/arm_dynarmic_64.cpp          |  6 ++--
 src/core/telemetry_session.cpp                     | 26 +++++++-------
 src/video_core/host1x/codecs/codec.cpp             |  2 +-
 src/video_core/host1x/codecs/h264.cpp              |  2 +-
 .../renderer_opengl/gl_compute_pipeline.cpp        |  6 ++--
 src/video_core/renderer_opengl/gl_device.cpp       |  8 ++---
 .../renderer_opengl/gl_graphics_pipeline.cpp       |  6 ++--
 src/video_core/renderer_opengl/gl_shader_cache.cpp | 12 +++----
 .../renderer_opengl/gl_texture_cache.cpp           |  4 +--
 src/video_core/renderer_vulkan/vk_swapchain.cpp    | 12 +++----
 .../renderer_vulkan/vk_texture_cache.cpp           |  6 ++--
 src/yuzu/configuration/config.cpp                  |  8 ++---
 src/yuzu/configuration/config.h                    |  6 ++--
 src/yuzu/configuration/configure_audio.cpp         |  2 +-
 src/yuzu/configuration/configure_cpu.cpp           |  6 ++--
 src/yuzu/configuration/configure_graphics.cpp      | 10 +++---
 src/yuzu/configuration/shared_translation.cpp      | 36 +++++++++----------
 src/yuzu/main.cpp                                  | 14 ++++----
 23 files changed, 136 insertions(+), 130 deletions(-)

(limited to 'src/common')

diff --git a/src/audio_core/sink/sink_details.cpp b/src/audio_core/sink/sink_details.cpp
index 751e97bfc..027bfa517 100644
--- a/src/audio_core/sink/sink_details.cpp
+++ b/src/audio_core/sink/sink_details.cpp
@@ -82,11 +82,12 @@ const SinkDetails& GetOutputSinkDetails(Settings::AudioEngine sink_id) {
 #else
         iter = std::begin(sink_details);
 #endif
-        LOG_INFO(Service_Audio, "Auto-selecting the {} backend", Settings::TranslateEnum(iter->id));
+        LOG_INFO(Service_Audio, "Auto-selecting the {} backend",
+                 Settings::CanonicalizeEnum(iter->id));
     }
 
     if (iter == std::end(sink_details)) {
-        LOG_ERROR(Audio, "Invalid sink_id {}", Settings::TranslateEnum(sink_id));
+        LOG_ERROR(Audio, "Invalid sink_id {}", Settings::CanonicalizeEnum(sink_id));
         iter = find_backend(Settings::AudioEngine::Null);
     }
 
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 8bfda5667..0a8729b5a 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -122,12 +122,12 @@ void SetConfiguringGlobal(bool is_global) {
 }
 
 bool IsGPULevelExtreme() {
-    return values.gpu_accuracy.GetValue() == GPUAccuracy::Extreme;
+    return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme;
 }
 
 bool IsGPULevelHigh() {
-    return values.gpu_accuracy.GetValue() == GPUAccuracy::Extreme ||
-           values.gpu_accuracy.GetValue() == GPUAccuracy::High;
+    return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme ||
+           values.gpu_accuracy.GetValue() == GpuAccuracy::High;
 }
 
 bool IsFastmemEnabled() {
diff --git a/src/common/settings.h b/src/common/settings.h
index a9ce113ef..141408d3e 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -91,6 +91,7 @@ public:
         return {};
     }
     virtual void LoadString(const std::string& load) = 0;
+    virtual std::string Canonicalize() const = 0;
     virtual const std::string& GetLabel() const = 0;
     virtual std::string DefaultToString() const = 0;
     virtual bool Save() const = 0;
@@ -102,7 +103,7 @@ public:
     virtual std::string MinVal() const = 0;
     virtual std::string MaxVal() const = 0;
     virtual bool UsingGlobal() const {
-        return false;
+        return true;
     }
 };
 
@@ -245,7 +246,7 @@ protected:
         } else if constexpr (std::is_same<Type, bool>()) {
             return value_ ? "true" : "false";
         } else if (std::is_same<Type, AudioEngine>()) {
-            return TranslateEnum(value_);
+            return CanonicalizeEnum(value_);
         } else {
             return std::to_string(static_cast<u64>(value_));
         }
@@ -321,6 +322,13 @@ public:
         }
     }
 
+    [[nodiscard]] std::string constexpr Canonicalize() const override {
+        if constexpr (std::is_enum<Type>::value) {
+            return CanonicalizeEnum(this->GetValue());
+        }
+        return ToString(this->GetValue());
+    }
+
     /**
      * Returns the save preference of the setting i.e. when saving or reading the setting from a
      * frontend, whether this setting should be skipped.
@@ -560,8 +568,8 @@ struct Values {
         linkage, false, "use_unsafe_extended_memory_layout", Category::Core};
 
     // Cpu
-    SwitchableSetting<CPUAccuracy, true> cpu_accuracy{linkage,           CPUAccuracy::Auto,
-                                                      CPUAccuracy::Auto, CPUAccuracy::Paranoid,
+    SwitchableSetting<CpuAccuracy, true> cpu_accuracy{linkage,           CpuAccuracy::Auto,
+                                                      CpuAccuracy::Auto, CpuAccuracy::Paranoid,
                                                       "cpu_accuracy",    Category::Cpu};
     // TODO: remove cpu_accuracy_first_time, migration setting added 8 July 2021
     Setting<bool> cpu_accuracy_first_time{linkage, true, "cpu_accuracy_first_time", Category::Cpu};
@@ -657,28 +665,28 @@ struct Values {
         linkage, 100, 0, 9999, "speed_limit", Category::Renderer, true, true};
     SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
                                                   Category::Renderer};
-    SwitchableSetting<GPUAccuracy, true> gpu_accuracy{linkage,
-                                                      GPUAccuracy::High,
-                                                      GPUAccuracy::Normal,
-                                                      GPUAccuracy::Extreme,
+    SwitchableSetting<GpuAccuracy, true> gpu_accuracy{linkage,
+                                                      GpuAccuracy::High,
+                                                      GpuAccuracy::Normal,
+                                                      GpuAccuracy::Extreme,
                                                       "gpu_accuracy",
                                                       Category::RendererAdvanced,
                                                       true,
                                                       true};
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{
         linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
-    SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::GPU,
+    SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::Gpu,
                                                       "nvdec_emulation", Category::Renderer};
     SwitchableSetting<AstcDecodeMode, true> accelerate_astc{linkage,
-                                                            AstcDecodeMode::CPU,
-                                                            AstcDecodeMode::CPU,
-                                                            AstcDecodeMode::CPUAsynchronous,
+                                                            AstcDecodeMode::Cpu,
+                                                            AstcDecodeMode::Cpu,
+                                                            AstcDecodeMode::CpuAsynchronous,
                                                             "accelerate_astc",
                                                             Category::Renderer};
     Setting<VSyncMode, true> vsync_mode{linkage,
-                                        VSyncMode::FIFO,
+                                        VSyncMode::Fifo,
                                         VSyncMode::Immediate,
-                                        VSyncMode::FIFORelaxed,
+                                        VSyncMode::FifoRelaxed,
                                         "use_vsync",
                                         Category::Renderer,
                                         true,
@@ -686,7 +694,7 @@ struct Values {
     SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
                                                   Category::RendererAdvanced};
     SwitchableSetting<ShaderBackend, true> shader_backend{
-        linkage,          ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV,
+        linkage,          ShaderBackend::Glsl, ShaderBackend::Glsl, ShaderBackend::SpirV,
         "shader_backend", Category::Renderer};
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::RendererAdvanced};
@@ -730,7 +738,7 @@ struct Values {
                                                      Language::PortugueseBrazilian,
                                                      "language_index",
                                                      Category::System};
-    SwitchableSetting<Region, true> region_index{linkage,        Region::USA,    Region::Japan,
+    SwitchableSetting<Region, true> region_index{linkage,        Region::Usa,    Region::Japan,
                                                  Region::Taiwan, "region_index", Category::System};
     SwitchableSetting<TimeZone, true> time_zone_index{linkage,           TimeZone::Auto,
                                                       TimeZone::Auto,    TimeZone::Zulu,
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index f48fb7bd4..6cd2ac28b 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -47,7 +47,7 @@ enum class Language : u32 {
 
 enum class Region : u32 {
     Japan,
-    USA,
+    Usa,
     Europe,
     Australia,
     China,
@@ -114,9 +114,9 @@ enum class AnisotropyMode : u32 {
 };
 
 enum class AstcDecodeMode : u32 {
-    CPU = 0,
-    GPU = 1,
-    CPUAsynchronous = 2,
+    Cpu = 0,
+    Gpu = 1,
+    CpuAsynchronous = 2,
 };
 
 enum class AstcRecompression : u32 {
@@ -128,8 +128,8 @@ enum class AstcRecompression : u32 {
 enum class VSyncMode : u32 {
     Immediate = 0,
     Mailbox = 1,
-    FIFO = 2,
-    FIFORelaxed = 3,
+    Fifo = 2,
+    FifoRelaxed = 3,
 };
 
 enum class RendererBackend : u32 {
@@ -139,19 +139,18 @@ enum class RendererBackend : u32 {
 };
 
 enum class ShaderBackend : u32 {
-    GLSL = 0,
-    GLASM = 1,
-    SPIRV = 2,
+    Glsl = 0,
+    Glasm = 1,
+    SpirV = 2,
 };
 
-enum class GPUAccuracy : u32 {
+enum class GpuAccuracy : u32 {
     Normal = 0,
     High = 1,
     Extreme = 2,
-    MaxEnum = 3,
 };
 
-enum class CPUAccuracy : u32 {
+enum class CpuAccuracy : u32 {
     Auto = 0,
     Accurate = 1,
     Unsafe = 2,
@@ -165,8 +164,8 @@ enum class FullscreenMode : u32 {
 
 enum class NvdecEmulation : u32 {
     Off = 0,
-    CPU = 1,
-    GPU = 2,
+    Cpu = 1,
+    Gpu = 2,
 };
 
 enum class ResolutionSetup : u32 {
@@ -220,18 +219,18 @@ static std::map<std::type_index, std::map<std::string, u32>> translations = {
 static std::string empty_string{};
 
 template <typename Type>
-const std::string& TranslateEnum(Type id) {
-    auto& group = translations.at(typeid(Type));
+const std::string& CanonicalizeEnum(Type id) {
+    auto& group = canonicalizations.at(typeid(Type));
     for (auto& [name, value] : group) {
         if (static_cast<Type>(value) == id) {
             return name;
         }
     }
-    return empty_string;
+    return invalid_string;
 }
 
 template <typename Type>
-static Type ToEnum(const std::string& text) {
-    return static_cast<Type>(translations.at(typeid(Type)).at(text));
+static Type ToEnum(const std::string& canonicalization) {
+    return static_cast<Type>(canonicalizations.at(typeid(Type)).at(canonicalization));
 }
 } // namespace Settings
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index 3b82fb73c..dc7cfd239 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -287,7 +287,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*
         }
     } else {
         // Unsafe optimizations
-        if (Settings::values.cpu_accuracy.GetValue() == Settings::CPUAccuracy::Unsafe) {
+        if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Unsafe) {
             config.unsafe_optimizations = true;
             if (Settings::values.cpuopt_unsafe_unfuse_fma) {
                 config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
@@ -307,7 +307,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*
         }
 
         // Curated optimizations
-        if (Settings::values.cpu_accuracy.GetValue() == Settings::CPUAccuracy::Auto) {
+        if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Auto) {
             config.unsafe_optimizations = true;
             config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
             config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreStandardFPCRValue;
@@ -316,7 +316,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*
         }
 
         // Paranoia mode for debugging optimizations
-        if (Settings::values.cpu_accuracy.GetValue() == Settings::CPUAccuracy::Paranoid) {
+        if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Paranoid) {
             config.unsafe_optimizations = false;
             config.optimizations = Dynarmic::no_optimizations;
         }
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index bb97ed5bc..a4cc74ebf 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -347,7 +347,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable*
         }
     } else {
         // Unsafe optimizations
-        if (Settings::values.cpu_accuracy.GetValue() == Settings::CPUAccuracy::Unsafe) {
+        if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Unsafe) {
             config.unsafe_optimizations = true;
             if (Settings::values.cpuopt_unsafe_unfuse_fma) {
                 config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
@@ -367,7 +367,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable*
         }
 
         // Curated optimizations
-        if (Settings::values.cpu_accuracy.GetValue() == Settings::CPUAccuracy::Auto) {
+        if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Auto) {
             config.unsafe_optimizations = true;
             config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
             config.fastmem_address_space_bits = 64;
@@ -375,7 +375,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable*
         }
 
         // Paranoia mode for debugging optimizations
-        if (Settings::values.cpu_accuracy.GetValue() == Settings::CPUAccuracy::Paranoid) {
+        if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Paranoid) {
             config.unsafe_optimizations = false;
             config.optimizations = Dynarmic::no_optimizations;
         }
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index c058ac2c7..62b3f6636 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -61,16 +61,14 @@ static const char* TranslateRenderer(Settings::RendererBackend backend) {
     return "Unknown";
 }
 
-static const char* TranslateGPUAccuracyLevel(Settings::GPUAccuracy backend) {
+static const char* TranslateGPUAccuracyLevel(Settings::GpuAccuracy backend) {
     switch (backend) {
-    case Settings::GPUAccuracy::Normal:
+    case Settings::GpuAccuracy::Normal:
         return "Normal";
-    case Settings::GPUAccuracy::High:
+    case Settings::GpuAccuracy::High:
         return "High";
-    case Settings::GPUAccuracy::Extreme:
+    case Settings::GpuAccuracy::Extreme:
         return "Extreme";
-    case Settings::GPUAccuracy::MaxEnum:
-        break;
     }
     return "Unknown";
 }
@@ -79,9 +77,9 @@ static const char* TranslateNvdecEmulation(Settings::NvdecEmulation backend) {
     switch (backend) {
     case Settings::NvdecEmulation::Off:
         return "Off";
-    case Settings::NvdecEmulation::CPU:
+    case Settings::NvdecEmulation::Cpu:
         return "CPU";
-    case Settings::NvdecEmulation::GPU:
+    case Settings::NvdecEmulation::Gpu:
         return "GPU";
     }
     return "Unknown";
@@ -93,9 +91,9 @@ static constexpr const char* TranslateVSyncMode(Settings::VSyncMode mode) {
         return "Immediate";
     case Settings::VSyncMode::Mailbox:
         return "Mailbox";
-    case Settings::VSyncMode::FIFO:
+    case Settings::VSyncMode::Fifo:
         return "FIFO";
-    case Settings::VSyncMode::FIFORelaxed:
+    case Settings::VSyncMode::FifoRelaxed:
         return "FIFO Relaxed";
     }
     return "Unknown";
@@ -103,11 +101,11 @@ static constexpr const char* TranslateVSyncMode(Settings::VSyncMode mode) {
 
 static constexpr const char* TranslateASTCDecodeMode(Settings::AstcDecodeMode mode) {
     switch (mode) {
-    case Settings::AstcDecodeMode::CPU:
+    case Settings::AstcDecodeMode::Cpu:
         return "CPU";
-    case Settings::AstcDecodeMode::GPU:
+    case Settings::AstcDecodeMode::Gpu:
         return "GPU";
-    case Settings::AstcDecodeMode::CPUAsynchronous:
+    case Settings::AstcDecodeMode::CpuAsynchronous:
         return "CPU Asynchronous";
     }
     return "Unknown";
@@ -255,7 +253,7 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader,
     // Log user configuration information
     constexpr auto field_type = Telemetry::FieldType::UserConfig;
     AddField(field_type, "Audio_SinkId",
-             Settings::TranslateEnum(Settings::values.sink_id.GetValue()));
+             Settings::CanonicalizeEnum(Settings::values.sink_id.GetValue()));
     AddField(field_type, "Core_UseMultiCore", Settings::values.use_multi_core.GetValue());
     AddField(field_type, "Renderer_Backend",
              TranslateRenderer(Settings::values.renderer_backend.GetValue()));
diff --git a/src/video_core/host1x/codecs/codec.cpp b/src/video_core/host1x/codecs/codec.cpp
index da07a556f..220cce28a 100644
--- a/src/video_core/host1x/codecs/codec.cpp
+++ b/src/video_core/host1x/codecs/codec.cpp
@@ -247,7 +247,7 @@ void Codec::Initialize() {
     av_codec = avcodec_find_decoder(codec);
 
     InitializeAvCodecContext();
-    if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::GPU) {
+    if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::Gpu) {
         InitializeGpuDecoder();
     }
     if (const int res = avcodec_open2(av_codec_ctx, av_codec, nullptr); res < 0) {
diff --git a/src/video_core/host1x/codecs/h264.cpp b/src/video_core/host1x/codecs/h264.cpp
index 862904e39..ece79b1e2 100644
--- a/src/video_core/host1x/codecs/h264.cpp
+++ b/src/video_core/host1x/codecs/h264.cpp
@@ -84,7 +84,7 @@ std::span<const u8> H264::ComposeFrame(const Host1x::NvdecCommon::NvdecRegisters
 
     // TODO (ameerj): Where do we get this number, it seems to be particular for each stream
     const auto nvdec_decoding = Settings::values.nvdec_emulation.GetValue();
-    const bool uses_gpu_decoding = nvdec_decoding == Settings::NvdecEmulation::GPU;
+    const bool uses_gpu_decoding = nvdec_decoding == Settings::NvdecEmulation::Gpu;
     const u32 max_num_ref_frames = uses_gpu_decoding ? 6u : 16u;
     writer.WriteUe(max_num_ref_frames);
     writer.WriteBit(false);
diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp
index f9ca55c36..d70501860 100644
--- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp
+++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp
@@ -34,13 +34,13 @@ ComputePipeline::ComputePipeline(const Device& device, TextureCache& texture_cac
     : texture_cache{texture_cache_}, buffer_cache{buffer_cache_},
       program_manager{program_manager_}, info{info_} {
     switch (device.GetShaderBackend()) {
-    case Settings::ShaderBackend::GLSL:
+    case Settings::ShaderBackend::Glsl:
         source_program = CreateProgram(code, GL_COMPUTE_SHADER);
         break;
-    case Settings::ShaderBackend::GLASM:
+    case Settings::ShaderBackend::Glasm:
         assembly_program = CompileProgram(code, GL_COMPUTE_PROGRAM_NV);
         break;
-    case Settings::ShaderBackend::SPIRV:
+    case Settings::ShaderBackend::SpirV:
         source_program = CreateProgram(code_v, GL_COMPUTE_SHADER);
         break;
     }
diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp
index 33e63c17d..ee140c9c2 100644
--- a/src/video_core/renderer_opengl/gl_device.cpp
+++ b/src/video_core/renderer_opengl/gl_device.cpp
@@ -177,15 +177,15 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) {
     has_fast_buffer_sub_data = is_nvidia && !disable_fast_buffer_sub_data;
 
     shader_backend = Settings::values.shader_backend.GetValue();
-    use_assembly_shaders = shader_backend == Settings::ShaderBackend::GLASM &&
+    use_assembly_shaders = shader_backend == Settings::ShaderBackend::Glasm &&
                            GLAD_GL_NV_gpu_program5 && GLAD_GL_NV_compute_program5 &&
                            GLAD_GL_NV_transform_feedback && GLAD_GL_NV_transform_feedback2;
-    if (shader_backend == Settings::ShaderBackend::GLASM && !use_assembly_shaders) {
+    if (shader_backend == Settings::ShaderBackend::Glasm && !use_assembly_shaders) {
         LOG_ERROR(Render_OpenGL, "Assembly shaders enabled but not supported");
-        shader_backend = Settings::ShaderBackend::GLSL;
+        shader_backend = Settings::ShaderBackend::Glsl;
     }
 
-    if (shader_backend == Settings::ShaderBackend::GLSL && is_nvidia) {
+    if (shader_backend == Settings::ShaderBackend::Glsl && is_nvidia) {
         const std::string_view driver_version = version.substr(13);
         const int version_major =
             std::atoi(driver_version.substr(0, driver_version.find(".")).data());
diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp
index 71f720c63..f822fa856 100644
--- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp
+++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp
@@ -236,18 +236,18 @@ GraphicsPipeline::GraphicsPipeline(const Device& device, TextureCache& texture_c
                force_context_flush](ShaderContext::Context*) mutable {
         for (size_t stage = 0; stage < 5; ++stage) {
             switch (backend) {
-            case Settings::ShaderBackend::GLSL:
+            case Settings::ShaderBackend::Glsl:
                 if (!sources_[stage].empty()) {
                     source_programs[stage] = CreateProgram(sources_[stage], Stage(stage));
                 }
                 break;
-            case Settings::ShaderBackend::GLASM:
+            case Settings::ShaderBackend::Glasm:
                 if (!sources_[stage].empty()) {
                     assembly_programs[stage] =
                         CompileProgram(sources_[stage], AssemblyStage(stage));
                 }
                 break;
-            case Settings::ShaderBackend::SPIRV:
+            case Settings::ShaderBackend::SpirV:
                 if (!sources_spirv_[stage].empty()) {
                     source_programs[stage] = CreateProgram(sources_spirv_[stage], Stage(stage));
                 }
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 7e1d7f92e..618cb6354 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -522,14 +522,14 @@ std::unique_ptr<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline(
         const auto runtime_info{
             MakeRuntimeInfo(key, program, previous_program, glasm_use_storage_buffers, use_glasm)};
         switch (device.GetShaderBackend()) {
-        case Settings::ShaderBackend::GLSL:
+        case Settings::ShaderBackend::Glsl:
             ConvertLegacyToGeneric(program, runtime_info);
             sources[stage_index] = EmitGLSL(profile, runtime_info, program, binding);
             break;
-        case Settings::ShaderBackend::GLASM:
+        case Settings::ShaderBackend::Glasm:
             sources[stage_index] = EmitGLASM(profile, runtime_info, program, binding);
             break;
-        case Settings::ShaderBackend::SPIRV:
+        case Settings::ShaderBackend::SpirV:
             ConvertLegacyToGeneric(program, runtime_info);
             sources_spirv[stage_index] = EmitSPIRV(profile, runtime_info, program, binding);
             break;
@@ -582,13 +582,13 @@ std::unique_ptr<ComputePipeline> ShaderCache::CreateComputePipeline(
     std::string code{};
     std::vector<u32> code_spirv;
     switch (device.GetShaderBackend()) {
-    case Settings::ShaderBackend::GLSL:
+    case Settings::ShaderBackend::Glsl:
         code = EmitGLSL(profile, program);
         break;
-    case Settings::ShaderBackend::GLASM:
+    case Settings::ShaderBackend::Glasm:
         code = EmitGLASM(profile, info, program);
         break;
-    case Settings::ShaderBackend::SPIRV:
+    case Settings::ShaderBackend::SpirV:
         code_spirv = EmitSPIRV(profile, program);
         break;
     }
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp
index 38ae12d8e..9cafd2983 100644
--- a/src/video_core/renderer_opengl/gl_texture_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp
@@ -232,7 +232,7 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array<SwizzleSource, 4
 [[nodiscard]] bool CanBeAccelerated(const TextureCacheRuntime& runtime,
                                     const VideoCommon::ImageInfo& info) {
     if (IsPixelFormatASTC(info.format) && info.size.depth == 1 && !runtime.HasNativeASTC()) {
-        return Settings::values.accelerate_astc.GetValue() == Settings::AstcDecodeMode::GPU &&
+        return Settings::values.accelerate_astc.GetValue() == Settings::AstcDecodeMode::Gpu &&
                Settings::values.astc_recompression.GetValue() ==
                    Settings::AstcRecompression::Uncompressed;
     }
@@ -267,7 +267,7 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array<SwizzleSource, 4
                                      const VideoCommon::ImageInfo& info) {
     if (IsPixelFormatASTC(info.format) && !runtime.HasNativeASTC()) {
         return Settings::values.accelerate_astc.GetValue() ==
-               Settings::AstcDecodeMode::CPUAsynchronous;
+               Settings::AstcDecodeMode::CpuAsynchronous;
     }
     return false;
 }
diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp
index d3cddac69..81ef98f61 100644
--- a/src/video_core/renderer_vulkan/vk_swapchain.cpp
+++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp
@@ -45,8 +45,8 @@ static VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox,
             return mode;
         }
         switch (mode) {
-        case Settings::VSyncMode::FIFO:
-        case Settings::VSyncMode::FIFORelaxed:
+        case Settings::VSyncMode::Fifo:
+        case Settings::VSyncMode::FifoRelaxed:
             if (has_mailbox) {
                 return Settings::VSyncMode::Mailbox;
             } else if (has_imm) {
@@ -59,8 +59,8 @@ static VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox,
     }();
     if ((setting == Settings::VSyncMode::Mailbox && !has_mailbox) ||
         (setting == Settings::VSyncMode::Immediate && !has_imm) ||
-        (setting == Settings::VSyncMode::FIFORelaxed && !has_fifo_relaxed)) {
-        setting = Settings::VSyncMode::FIFO;
+        (setting == Settings::VSyncMode::FifoRelaxed && !has_fifo_relaxed)) {
+        setting = Settings::VSyncMode::Fifo;
     }
 
     switch (setting) {
@@ -68,9 +68,9 @@ static VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox,
         return VK_PRESENT_MODE_IMMEDIATE_KHR;
     case Settings::VSyncMode::Mailbox:
         return VK_PRESENT_MODE_MAILBOX_KHR;
-    case Settings::VSyncMode::FIFO:
+    case Settings::VSyncMode::Fifo:
         return VK_PRESENT_MODE_FIFO_KHR;
-    case Settings::VSyncMode::FIFORelaxed:
+    case Settings::VSyncMode::FifoRelaxed:
         return VK_PRESENT_MODE_FIFO_RELAXED_KHR;
     default:
         return VK_PRESENT_MODE_FIFO_KHR;
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index a060c3934..53d749bd4 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -817,7 +817,7 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, Scheduler& sched
     : device{device_}, scheduler{scheduler_}, memory_allocator{memory_allocator_},
       staging_buffer_pool{staging_buffer_pool_}, blit_image_helper{blit_image_helper_},
       render_pass_cache{render_pass_cache_}, resolution{Settings::values.resolution_info} {
-    if (Settings::values.accelerate_astc.GetValue() == Settings::AstcDecodeMode::GPU) {
+    if (Settings::values.accelerate_astc.GetValue() == Settings::AstcDecodeMode::Gpu) {
         astc_decoder_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool,
                                   compute_pass_descriptor_queue, memory_allocator);
     }
@@ -1302,14 +1302,14 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu
       aspect_mask(ImageAspectMask(info.format)) {
     if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported()) {
         switch (Settings::values.accelerate_astc.GetValue()) {
-        case Settings::AstcDecodeMode::GPU:
+        case Settings::AstcDecodeMode::Gpu:
             if (Settings::values.astc_recompression.GetValue() ==
                     Settings::AstcRecompression::Uncompressed &&
                 info.size.depth == 1) {
                 flags |= VideoCommon::ImageFlagBits::AcceleratedUpload;
             }
             break;
-        case Settings::AstcDecodeMode::CPUAsynchronous:
+        case Settings::AstcDecodeMode::CpuAsynchronous:
             flags |= VideoCommon::ImageFlagBits::AsynchronousDecode;
             break;
         default:
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 28ee5d492..051756452 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -89,10 +89,10 @@ const std::map<bool, QString> Config::use_docked_mode_texts_map = {
     {false, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))},
 };
 
-const std::map<Settings::GPUAccuracy, QString> Config::gpu_accuracy_texts_map = {
-    {Settings::GPUAccuracy::Normal, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Normal"))},
-    {Settings::GPUAccuracy::High, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "High"))},
-    {Settings::GPUAccuracy::Extreme, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Extreme"))},
+const std::map<Settings::GpuAccuracy, QString> Config::gpu_accuracy_texts_map = {
+    {Settings::GpuAccuracy::Normal, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Normal"))},
+    {Settings::GpuAccuracy::High, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "High"))},
+    {Settings::GpuAccuracy::Extreme, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Extreme"))},
 };
 
 const std::map<Settings::RendererBackend, QString> Config::renderer_backend_texts_map = {
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index 553a82295..c00e717b8 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -52,7 +52,7 @@ public:
     static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map;
     static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map;
     static const std::map<bool, QString> use_docked_mode_texts_map;
-    static const std::map<Settings::GPUAccuracy, QString> gpu_accuracy_texts_map;
+    static const std::map<Settings::GpuAccuracy, QString> gpu_accuracy_texts_map;
     static const std::map<Settings::RendererBackend, QString> renderer_backend_texts_map;
     static const std::map<Settings::ShaderBackend, QString> shader_backend_texts_map;
 
@@ -211,8 +211,8 @@ private:
 };
 
 // These metatype declarations cannot be in common/settings.h because core is devoid of QT
-Q_DECLARE_METATYPE(Settings::CPUAccuracy);
-Q_DECLARE_METATYPE(Settings::GPUAccuracy);
+Q_DECLARE_METATYPE(Settings::CpuAccuracy);
+Q_DECLARE_METATYPE(Settings::GpuAccuracy);
 Q_DECLARE_METATYPE(Settings::FullscreenMode);
 Q_DECLARE_METATYPE(Settings::NvdecEmulation);
 Q_DECLARE_METATYPE(Settings::ResolutionSetup);
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 0496bd78f..7cc8affb7 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -188,7 +188,7 @@ void ConfigureAudio::InitializeAudioSinkComboBox() {
     sink_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
 
     for (const auto& id : AudioCore::Sink::GetSinkIDs()) {
-        sink_combo_box->addItem(QString::fromStdString(Settings::TranslateEnum(id)));
+        sink_combo_box->addItem(QString::fromStdString(Settings::CanonicalizeEnum(id)));
     }
 }
 
diff --git a/src/yuzu/configuration/configure_cpu.cpp b/src/yuzu/configuration/configure_cpu.cpp
index ac298a50f..67b811014 100644
--- a/src/yuzu/configuration/configure_cpu.cpp
+++ b/src/yuzu/configuration/configure_cpu.cpp
@@ -73,9 +73,9 @@ void ConfigureCpu::Setup() {
 }
 
 void ConfigureCpu::UpdateGroup(int index) {
-    const auto accuracy = static_cast<Settings::CPUAccuracy>(
-        combobox_translations.at(typeid(Settings::CPUAccuracy))[index].first);
-    ui->unsafe_group->setVisible(accuracy == Settings::CPUAccuracy::Unsafe);
+    const auto accuracy = static_cast<Settings::CpuAccuracy>(
+        combobox_translations.at(typeid(Settings::CpuAccuracy))[index].first);
+    ui->unsafe_group->setVisible(accuracy == Settings::CpuAccuracy::Unsafe);
 }
 
 void ConfigureCpu::ApplyConfiguration() {
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 59702603a..1e26267a0 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -51,9 +51,9 @@ static constexpr VkPresentModeKHR VSyncSettingToMode(Settings::VSyncMode mode) {
         return VK_PRESENT_MODE_IMMEDIATE_KHR;
     case Settings::VSyncMode::Mailbox:
         return VK_PRESENT_MODE_MAILBOX_KHR;
-    case Settings::VSyncMode::FIFO:
+    case Settings::VSyncMode::Fifo:
         return VK_PRESENT_MODE_FIFO_KHR;
-    case Settings::VSyncMode::FIFORelaxed:
+    case Settings::VSyncMode::FifoRelaxed:
         return VK_PRESENT_MODE_FIFO_RELAXED_KHR;
     default:
         return VK_PRESENT_MODE_FIFO_KHR;
@@ -67,11 +67,11 @@ static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode)
     case VK_PRESENT_MODE_MAILBOX_KHR:
         return Settings::VSyncMode::Mailbox;
     case VK_PRESENT_MODE_FIFO_KHR:
-        return Settings::VSyncMode::FIFO;
+        return Settings::VSyncMode::Fifo;
     case VK_PRESENT_MODE_FIFO_RELAXED_KHR:
-        return Settings::VSyncMode::FIFORelaxed;
+        return Settings::VSyncMode::FifoRelaxed;
     default:
-        return Settings::VSyncMode::FIFO;
+        return Settings::VSyncMode::Fifo;
     }
 }
 
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 5d4e29a08..4caa44e1b 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -177,9 +177,9 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
     translations->insert(
         {typeid(Settings::AstcDecodeMode),
          {
-             {static_cast<u32>(Settings::AstcDecodeMode::CPU), tr("CPU")},
-             {static_cast<u32>(Settings::AstcDecodeMode::GPU), tr("GPU")},
-             {static_cast<u32>(Settings::AstcDecodeMode::CPUAsynchronous), tr("CPU Asynchronous")},
+             {static_cast<u32>(Settings::AstcDecodeMode::Cpu), tr("CPU")},
+             {static_cast<u32>(Settings::AstcDecodeMode::Gpu), tr("GPU")},
+             {static_cast<u32>(Settings::AstcDecodeMode::CpuAsynchronous), tr("CPU Asynchronous")},
          }});
     translations->insert(
         {typeid(Settings::AstcRecompression),
@@ -199,24 +199,24 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
                           }});
     translations->insert({typeid(Settings::ShaderBackend),
                           {
-                              {static_cast<u32>(Settings::ShaderBackend::GLSL), tr("GLSL")},
-                              {static_cast<u32>(Settings::ShaderBackend::GLASM),
+                              {static_cast<u32>(Settings::ShaderBackend::Glsl), tr("GLSL")},
+                              {static_cast<u32>(Settings::ShaderBackend::Glasm),
                                tr("GLASM (Assembly Shaders, NVIDIA Only)")},
-                              {static_cast<u32>(Settings::ShaderBackend::SPIRV),
+                              {static_cast<u32>(Settings::ShaderBackend::SpirV),
                                tr("SPIR-V (Experimental, Mesa Only)")},
                           }});
-    translations->insert({typeid(Settings::GPUAccuracy),
+    translations->insert({typeid(Settings::GpuAccuracy),
                           {
-                              {static_cast<u32>(Settings::GPUAccuracy::Normal), tr("Normal")},
-                              {static_cast<u32>(Settings::GPUAccuracy::High), tr("High")},
-                              {static_cast<u32>(Settings::GPUAccuracy::Extreme), tr("Extreme")},
+                              {static_cast<u32>(Settings::GpuAccuracy::Normal), tr("Normal")},
+                              {static_cast<u32>(Settings::GpuAccuracy::High), tr("High")},
+                              {static_cast<u32>(Settings::GpuAccuracy::Extreme), tr("Extreme")},
                           }});
-    translations->insert({typeid(Settings::CPUAccuracy),
+    translations->insert({typeid(Settings::CpuAccuracy),
                           {
-                              {static_cast<u32>(Settings::CPUAccuracy::Auto), tr("Auto")},
-                              {static_cast<u32>(Settings::CPUAccuracy::Accurate), tr("Accurate")},
-                              {static_cast<u32>(Settings::CPUAccuracy::Unsafe), tr("Unsafe")},
-                              {static_cast<u32>(Settings::CPUAccuracy::Paranoid),
+                              {static_cast<u32>(Settings::CpuAccuracy::Auto), tr("Auto")},
+                              {static_cast<u32>(Settings::CpuAccuracy::Accurate), tr("Accurate")},
+                              {static_cast<u32>(Settings::CpuAccuracy::Unsafe), tr("Unsafe")},
+                              {static_cast<u32>(Settings::CpuAccuracy::Paranoid),
                                tr("Paranoid (disables most optimizations)")},
                           }});
     translations->insert(
@@ -229,8 +229,8 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
         {typeid(Settings::NvdecEmulation),
          {
              {static_cast<u32>(Settings::NvdecEmulation::Off), tr("No Video Output")},
-             {static_cast<u32>(Settings::NvdecEmulation::CPU), tr("CPU Video Decoding")},
-             {static_cast<u32>(Settings::NvdecEmulation::GPU), tr("GPU Video Decoding (Default)")},
+             {static_cast<u32>(Settings::NvdecEmulation::Cpu), tr("CPU Video Decoding")},
+             {static_cast<u32>(Settings::NvdecEmulation::Gpu), tr("GPU Video Decoding (Default)")},
          }});
     translations->insert(
         {typeid(Settings::ResolutionSetup),
@@ -313,7 +313,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
     translations->insert({typeid(Settings::Region),
                           {
                               {static_cast<u32>(Settings::Region::Japan), tr("Japan")},
-                              {static_cast<u32>(Settings::Region::USA), tr("USA")},
+                              {static_cast<u32>(Settings::Region::Usa), tr("USA")},
                               {static_cast<u32>(Settings::Region::Europe), tr("Europe")},
                               {static_cast<u32>(Settings::Region::Australia), tr("Australia")},
                               {static_cast<u32>(Settings::Region::China), tr("China")},
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 6cd557c29..2922b3347 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1183,7 +1183,7 @@ void GMainWindow::InitializeWidgets() {
                 QMenu context_menu;
 
                 for (auto const& gpu_accuracy_pair : Config::gpu_accuracy_texts_map) {
-                    if (gpu_accuracy_pair.first == Settings::GPUAccuracy::Extreme) {
+                    if (gpu_accuracy_pair.first == Settings::GpuAccuracy::Extreme) {
                         continue;
                     }
                     context_menu.addAction(gpu_accuracy_pair.second, [this, gpu_accuracy_pair] {
@@ -3651,14 +3651,14 @@ void GMainWindow::OnToggleDockedMode() {
 
 void GMainWindow::OnToggleGpuAccuracy() {
     switch (Settings::values.gpu_accuracy.GetValue()) {
-    case Settings::GPUAccuracy::High: {
-        Settings::values.gpu_accuracy.SetValue(Settings::GPUAccuracy::Normal);
+    case Settings::GpuAccuracy::High: {
+        Settings::values.gpu_accuracy.SetValue(Settings::GpuAccuracy::Normal);
         break;
     }
-    case Settings::GPUAccuracy::Normal:
-    case Settings::GPUAccuracy::Extreme:
+    case Settings::GpuAccuracy::Normal:
+    case Settings::GpuAccuracy::Extreme:
     default: {
-        Settings::values.gpu_accuracy.SetValue(Settings::GPUAccuracy::High);
+        Settings::values.gpu_accuracy.SetValue(Settings::GpuAccuracy::High);
         break;
     }
     }
@@ -4071,7 +4071,7 @@ void GMainWindow::UpdateGPUAccuracyButton() {
     const auto gpu_accuracy = Settings::values.gpu_accuracy.GetValue();
     const auto gpu_accuracy_text = Config::gpu_accuracy_texts_map.find(gpu_accuracy)->second;
     gpu_accuracy_button->setText(gpu_accuracy_text.toUpper());
-    gpu_accuracy_button->setChecked(gpu_accuracy != Settings::GPUAccuracy::Normal);
+    gpu_accuracy_button->setChecked(gpu_accuracy != Settings::GpuAccuracy::Normal);
 }
 
 void GMainWindow::UpdateDockedButton() {
-- 
cgit v1.2.3


From 8c17a945f71b8532b0a4c3903b00a09d99ff0d6c Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 7 Jun 2023 01:53:05 -0400
Subject: settings_enums: Cannonicalize settings names

Gives every option of the enums a string literal via a macro.
---
 src/common/settings_enums.h | 165 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 163 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index 6cd2ac28b..d820bc48e 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -207,16 +207,177 @@ enum class AspectRatio : u32 {
     Stretch,
 };
 
-static std::map<std::type_index, std::map<std::string, u32>> translations = {
+#define X(ENUM, NAME)                                                                              \
+    { (#NAME), static_cast<u32>(ENUM::NAME) }
+
+static std::map<std::type_index, std::map<std::string, u32>> canonicalizations = {
     {typeid(AudioEngine),
      {
          {"auto", static_cast<u32>(AudioEngine::Auto)},
          {"cubeb", static_cast<u32>(AudioEngine::Cubeb)},
          {"sdl2", static_cast<u32>(AudioEngine::Sdl2)},
          {"null", static_cast<u32>(AudioEngine::Null)},
+     }},
+    {typeid(AudioMode),
+     {
+         X(AudioMode, Mono),
+         X(AudioMode, Stereo),
+         X(AudioMode, Surround),
+     }},
+    {typeid(Language),
+     {
+         X(Language, Japanese),
+         X(Language, EnglishAmerican),
+         X(Language, French),
+         X(Language, German),
+         X(Language, Italian),
+         X(Language, Spanish),
+         X(Language, Chinese),
+         X(Language, Korean),
+         X(Language, Dutch),
+         X(Language, Portuguese),
+         X(Language, Russian),
+         X(Language, Taiwanese),
+         X(Language, EnglishBritish),
+         X(Language, FrenchCanadian),
+         X(Language, SpanishLatin),
+         X(Language, ChineseSimplified),
+         X(Language, ChineseTraditional),
+         X(Language, PortugueseBrazilian),
+     }},
+    {typeid(Region),
+     {
+         X(Region, Japan),
+         X(Region, Usa),
+         X(Region, Europe),
+         X(Region, Australia),
+         X(Region, China),
+         X(Region, Korea),
+         X(Region, Taiwan),
+     }},
+    {typeid(TimeZone),
+     {
+         X(TimeZone, Auto),        X(TimeZone, Default),      X(TimeZone, CET),
+         X(TimeZone, CST6CDT),     X(TimeZone, Cuba),         X(TimeZone, EET),
+         X(TimeZone, Egypt),       X(TimeZone, Eire),         X(TimeZone, EST5EDT),
+         X(TimeZone, GB),          X(TimeZone, GBEire),       X(TimeZone, GMT),
+         X(TimeZone, GMTPlusZero), X(TimeZone, GMTMinusZero), X(TimeZone, GMTZero),
+         X(TimeZone, Greenwich),   X(TimeZone, Hongkong),     X(TimeZone, HST),
+         X(TimeZone, Iceland),     X(TimeZone, Iran),         X(TimeZone, Israel),
+         X(TimeZone, Jamaica),     X(TimeZone, Japan),        X(TimeZone, Kwajalein),
+         X(TimeZone, Libya),       X(TimeZone, MET),          X(TimeZone, MST),
+         X(TimeZone, MST7MDT),     X(TimeZone, Navajo),       X(TimeZone, NZ),
+         X(TimeZone, NZCHAT),      X(TimeZone, Poland),       X(TimeZone, Portugal),
+         X(TimeZone, PRC),         X(TimeZone, ROC),          X(TimeZone, ROK),
+         X(TimeZone, Singapore),   X(TimeZone, Turkey),       X(TimeZone, UCT),
+         X(TimeZone, Universal),   X(TimeZone, UTC),          X(TimeZone, W_SU),
+         X(TimeZone, WET),         X(TimeZone, Zulu),
+     }},
+    {typeid(AnisotropyMode),
+     {
+         X(AnisotropyMode, Automatic),
+         X(AnisotropyMode, Default),
+         X(AnisotropyMode, X2),
+         X(AnisotropyMode, X4),
+         X(AnisotropyMode, X8),
+         X(AnisotropyMode, X16),
+     }},
+    {typeid(AstcDecodeMode),
+     {
+         X(AstcDecodeMode, Cpu),
+         X(AstcDecodeMode, Gpu),
+         X(AstcDecodeMode, CpuAsynchronous),
+     }},
+    {typeid(AstcRecompression),
+     {
+         X(AstcRecompression, Uncompressed),
+         X(AstcRecompression, Bc1),
+         X(AstcRecompression, Bc3),
+     }},
+    {typeid(VSyncMode),
+     {
+         X(VSyncMode, Immediate),
+         X(VSyncMode, Mailbox),
+         X(VSyncMode, Fifo),
+         X(VSyncMode, FifoRelaxed),
+     }},
+    {typeid(RendererBackend),
+     {
+         X(RendererBackend, OpenGL),
+         X(RendererBackend, Vulkan),
+         X(RendererBackend, Null),
+     }},
+    {typeid(ShaderBackend),
+     {
+         X(ShaderBackend, Glsl),
+         X(ShaderBackend, Glasm),
+         X(ShaderBackend, SpirV),
+     }},
+    {typeid(GpuAccuracy),
+     {
+         X(GpuAccuracy, Normal),
+         X(GpuAccuracy, High),
+         X(GpuAccuracy, Extreme),
+     }},
+    {typeid(CpuAccuracy),
+     {
+         X(CpuAccuracy, Auto),
+         X(CpuAccuracy, Accurate),
+         X(CpuAccuracy, Unsafe),
+         X(CpuAccuracy, Paranoid),
+     }},
+    {typeid(FullscreenMode),
+     {
+         X(FullscreenMode, Borderless),
+         X(FullscreenMode, Exclusive),
+     }},
+    {typeid(NvdecEmulation),
+     {
+         X(NvdecEmulation, Off),
+         X(NvdecEmulation, Cpu),
+         X(NvdecEmulation, Gpu),
+     }},
+    {typeid(ResolutionSetup),
+     {
+         X(ResolutionSetup, Res1_2X),
+         X(ResolutionSetup, Res3_4X),
+         X(ResolutionSetup, Res1X),
+         X(ResolutionSetup, Res3_2X),
+         X(ResolutionSetup, Res2X),
+         X(ResolutionSetup, Res3X),
+         X(ResolutionSetup, Res4X),
+         X(ResolutionSetup, Res5X),
+         X(ResolutionSetup, Res6X),
+         X(ResolutionSetup, Res7X),
+         X(ResolutionSetup, Res8X),
+     }},
+    {typeid(ScalingFilter),
+     {
+         X(ScalingFilter, NearestNeighbor),
+         X(ScalingFilter, Bilinear),
+         X(ScalingFilter, Bicubic),
+         X(ScalingFilter, Gaussian),
+         X(ScalingFilter, ScaleForce),
+         X(ScalingFilter, Fsr),
+     }},
+    {typeid(AntiAliasing),
+     {
+         X(AntiAliasing, None),
+         X(AntiAliasing, Fxaa),
+         X(AntiAliasing, Smaa),
+     }},
+    {typeid(AspectRatio),
+     {
+         X(AspectRatio, R16_9),
+         X(AspectRatio, R4_3),
+         X(AspectRatio, R21_9),
+         X(AspectRatio, R16_10),
+         X(AspectRatio, Stretch),
      }}};
 
-static std::string empty_string{};
+#undef X
+
+static std::string invalid_string{"(invalid setting)"};
 
 template <typename Type>
 const std::string& CanonicalizeEnum(Type id) {
-- 
cgit v1.2.3


From 78b270937367b813ef27a019e1a7a3728e3f9d55 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 7 Jun 2023 01:53:57 -0400
Subject: settings: Report all contained settings values

Also adds a couple characters that denotes the state of the setting.
M for modified, or not default.
C for custom, in context of per-game settings.
---
 src/common/settings.cpp | 64 +++++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 45 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 0a8729b5a..84e90f893 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -61,56 +61,30 @@ void LogSettings() {
     };
 
     LOG_INFO(Config, "yuzu Configuration:");
-    log_setting("Controls_UseDockedMode", values.use_docked_mode.GetValue());
-    log_setting("System_RngSeedEnabled", values.rng_seed_enabled.GetValue());
-    log_setting("System_RngSeed", values.rng_seed.GetValue());
-    log_setting("System_DeviceName", values.device_name.GetValue());
-    log_setting("System_CurrentUser", values.current_user.GetValue());
-    log_setting("System_LanguageIndex", values.language_index.GetValue());
-    log_setting("System_RegionIndex", values.region_index.GetValue());
-    log_setting("System_TimeZoneIndex", values.time_zone_index.GetValue());
-    log_setting("System_UnsafeMemoryLayout", values.use_unsafe_extended_memory_layout.GetValue());
-    log_setting("Core_UseMultiCore", values.use_multi_core.GetValue());
-    log_setting("CPU_Accuracy", values.cpu_accuracy.GetValue());
-    log_setting("Renderer_UseResolutionScaling", values.resolution_setup.GetValue());
-    log_setting("Renderer_ScalingFilter", values.scaling_filter.GetValue());
-    log_setting("Renderer_FSRSlider", values.fsr_sharpening_slider.GetValue());
-    log_setting("Renderer_AntiAliasing", values.anti_aliasing.GetValue());
-    log_setting("Renderer_UseSpeedLimit", values.use_speed_limit.GetValue());
-    log_setting("Renderer_SpeedLimit", values.speed_limit.GetValue());
-    log_setting("Renderer_UseDiskShaderCache", values.use_disk_shader_cache.GetValue());
-    log_setting("Renderer_GPUAccuracyLevel", values.gpu_accuracy.GetValue());
-    log_setting("Renderer_UseAsynchronousGpuEmulation",
-                values.use_asynchronous_gpu_emulation.GetValue());
-    log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue());
-    log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue());
-    log_setting("Renderer_AstcRecompression", values.astc_recompression.GetValue());
-    log_setting("Renderer_UseVsync", values.vsync_mode.GetValue());
-    log_setting("Renderer_UseReactiveFlushing", values.use_reactive_flushing.GetValue());
-    log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue());
-    log_setting("Renderer_UseAsynchronousShaders", values.use_asynchronous_shaders.GetValue());
-    log_setting("Renderer_AnisotropicFilteringLevel", values.max_anisotropy.GetValue());
-    log_setting("Audio_OutputEngine", Settings::TranslateEnum(values.sink_id.GetValue()));
-    log_setting("Audio_OutputDevice", values.audio_output_device_id.GetValue());
-    log_setting("Audio_InputDevice", values.audio_input_device_id.GetValue());
-    log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd.GetValue());
+    for (auto& [category, settings] : values.linkage.by_category) {
+        settings.sort([](const BasicSetting* a, const BasicSetting* b) {
+            return a->GetLabel() < b->GetLabel();
+        });
+
+        for (const auto& setting : settings) {
+            if (setting->Id() == values.yuzu_token.Id()) {
+                // Hide the token secret, which could be used to share patreon builds
+                continue;
+            }
+
+            std::string name = fmt::format(
+                "{:c}{:c} {}.{}", setting->ToString() == setting->DefaultToString() ? '-' : 'M',
+                setting->UsingGlobal() ? '-' : 'C', TranslateCategory(category),
+                setting->GetLabel());
+
+            log_setting(name, setting->Canonicalize());
+        }
+    }
     log_path("DataStorage_CacheDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir));
     log_path("DataStorage_ConfigDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir));
     log_path("DataStorage_LoadDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::LoadDir));
     log_path("DataStorage_NANDDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir));
     log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
-    log_setting("Debugging_ProgramArgs", values.program_args.GetValue());
-    log_setting("Debugging_GDBStub", values.use_gdbstub.GetValue());
-    log_setting("Input_EnableMotion", values.motion_enabled.GetValue());
-    log_setting("Input_EnableVibration", values.vibration_enabled.GetValue());
-    log_setting("Input_EnableTouch", values.touchscreen.enabled);
-    log_setting("Input_EnableMouse", values.mouse_enabled.GetValue());
-    log_setting("Input_EnableKeyboard", values.keyboard_enabled.GetValue());
-    log_setting("Input_EnableRingController", values.enable_ring_controller.GetValue());
-    log_setting("Input_EnableIrSensor", values.enable_ir_sensor.GetValue());
-    log_setting("Input_EnableCustomJoycon", values.enable_joycon_driver.GetValue());
-    log_setting("Input_EnableCustomProController", values.enable_procon_driver.GetValue());
-    log_setting("Input_EnableRawInput", values.enable_raw_input.GetValue());
 }
 
 bool IsConfiguringGlobal() {
-- 
cgit v1.2.3


From 163f229d2641426a163356c877ecd5b8b7555558 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Fri, 9 Jun 2023 17:24:29 -0400
Subject: settings: Reorder

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.
---
 src/common/settings.h | 153 +++++++++++++++++++++++++-------------------------
 1 file changed, 78 insertions(+), 75 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 141408d3e..f6e977e96 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -557,8 +557,11 @@ struct Values {
     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_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};
+    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,
                                              false};
 
@@ -612,28 +615,35 @@ struct Values {
     SwitchableSetting<RendererBackend, true> renderer_backend{
         linkage,   RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null,
         "backend", Category::Renderer};
-    SwitchableSetting<bool> async_presentation{linkage, false, "async_presentation",
-                                               Category::RendererAdvanced};
-    SwitchableSetting<bool> renderer_force_max_clock{linkage, false, "force_max_clock",
-                                                     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<ShaderBackend, true> shader_backend{
+        linkage,          ShaderBackend::Glsl, ShaderBackend::Glsl, ShaderBackend::SpirV,
+        "shader_backend", Category::Renderer};
     SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer};
 
-    ResolutionScalingInfo resolution_info{};
-    SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
-                                                        "resolution_setup", Category::Renderer};
-    SwitchableSetting<ScalingFilter, false> scaling_filter{
-        linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer, true, true};
-    SwitchableSetting<int, true> fsr_sharpening_slider{
-        linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer, true, true};
-    SwitchableSetting<AntiAliasing, false> anti_aliasing{
-        linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer, true, true};
+    SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
+                                                  Category::Renderer};
+    SwitchableSetting<bool> use_asynchronous_gpu_emulation{
+        linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
+    SwitchableSetting<bool, false> use_speed_limit{
+        linkage, true, "use_speed_limit", Category::Renderer, false, true};
+    SwitchableSetting<u16, true> speed_limit{
+        linkage, 100, 0, 9999, "speed_limit", 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.
     // Default to exclusive fullscreen on these platforms for now.
     SwitchableSetting<FullscreenMode, true> fullscreen_mode{linkage,
@@ -656,15 +666,21 @@ struct Values {
                                                       Category::Renderer,
                                                       true,
                                                       true};
-    SwitchableSetting<AnisotropyMode, true> max_anisotropy{
-        linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
-        "max_anisotropy", Category::RendererAdvanced};
-    SwitchableSetting<bool, false> use_speed_limit{
-        linkage, true, "use_speed_limit", Category::Renderer, false, true};
-    SwitchableSetting<u16, true> speed_limit{
-        linkage, 100, 0, 9999, "speed_limit", Category::Renderer, true, true};
-    SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
-                                                  Category::Renderer};
+
+    ResolutionScalingInfo resolution_info{};
+    SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
+                                                        "resolution_setup", Category::Renderer};
+    SwitchableSetting<ScalingFilter, false> scaling_filter{
+        linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer, true, true};
+    SwitchableSetting<AntiAliasing, false> anti_aliasing{
+        linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer, true, true};
+    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,
                                                       GpuAccuracy::High,
                                                       GpuAccuracy::Normal,
@@ -673,29 +689,21 @@ struct Values {
                                                       Category::RendererAdvanced,
                                                       true,
                                                       true};
-    SwitchableSetting<bool> use_asynchronous_gpu_emulation{
-        linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
-    SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::Gpu,
-                                                      "nvdec_emulation", Category::Renderer};
-    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<AnisotropyMode, true> max_anisotropy{
+        linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
+        "max_anisotropy", Category::RendererAdvanced};
+    SwitchableSetting<AstcRecompression, true> astc_recompression{linkage,
+                                                                  AstcRecompression::Uncompressed,
+                                                                  AstcRecompression::Uncompressed,
+                                                                  AstcRecompression::Bc3,
+                                                                  "astc_recompression",
+                                                                  Category::RendererAdvanced};
+    SwitchableSetting<bool> async_presentation{linkage, false, "async_presentation",
+                                               Category::RendererAdvanced};
+    SwitchableSetting<bool> renderer_force_max_clock{linkage, false, "force_max_clock",
+                                                     Category::RendererAdvanced};
     SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
                                                   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",
                                                      Category::RendererAdvanced};
     SwitchableSetting<bool, false> use_fast_gpu_time{
@@ -704,34 +712,20 @@ struct Values {
         linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced, true, true};
     SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
                                                      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",
                                                 Category::RendererAdvanced};
     SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops",
                                                    Category::RendererAdvanced};
 
-    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};
+    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};
 
     // 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,
                                                      Language::EnglishAmerican,
                                                      Language::Japanese,
@@ -743,9 +737,18 @@ struct Values {
     SwitchableSetting<TimeZone, true> time_zone_index{linkage,           TimeZone::Auto,
                                                       TimeZone::Auto,    TimeZone::Zulu,
                                                       "time_zone_index", Category::System};
-    SwitchableSetting<AudioMode, true> sound_index{linkage,         AudioMode::Stereo,
-                                                   AudioMode::Mono, AudioMode::Surround,
-                                                   "sound_index",   Category::SystemAudio};
+    // 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;
+    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};
 
-- 
cgit v1.2.3


From b86171d2b58e3f37e27d6d362548be5560c44764 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Fri, 9 Jun 2023 19:40:04 -0400
Subject: settings: yuzu is not capitalized why is it capitalized stop no bad

---
 src/common/settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index f6e977e96..384a8ecb6 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -746,7 +746,7 @@ struct Values {
     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<std::string> device_name{linkage, "yuzu", "device_name", Category::System, true, true};
 
     Setting<s32> current_user{linkage, 0, "current_user", Category::System};
 
-- 
cgit v1.2.3


From 2fba913d0bc022085a0de8848ced02f38e48cd54 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sat, 10 Jun 2023 00:35:45 -0400
Subject: settings_enums: Add const type where needed

---
 src/common/settings_enums.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index d820bc48e..2710f136d 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -210,7 +210,7 @@ enum class AspectRatio : u32 {
 #define X(ENUM, NAME)                                                                              \
     { (#NAME), static_cast<u32>(ENUM::NAME) }
 
-static std::map<std::type_index, std::map<std::string, u32>> canonicalizations = {
+static const std::map<std::type_index, std::map<std::string, u32>> canonicalizations = {
     {typeid(AudioEngine),
      {
          {"auto", static_cast<u32>(AudioEngine::Auto)},
@@ -377,7 +377,7 @@ static std::map<std::type_index, std::map<std::string, u32>> canonicalizations =
 
 #undef X
 
-static std::string invalid_string{"(invalid setting)"};
+static const std::string invalid_string{"(invalid setting)"};
 
 template <typename Type>
 const std::string& CanonicalizeEnum(Type id) {
-- 
cgit v1.2.3


From 0193add060ecc591ca27d029916823911df5d503 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sat, 10 Jun 2023 00:44:03 -0400
Subject: general: Add typeinfo where needed

Using typeid without including typeinfo first produces an ill-formed program.
---
 src/common/settings.h                         | 1 +
 src/common/settings_enums.h                   | 1 +
 src/yuzu/configuration/configure_cpu.cpp      | 1 +
 src/yuzu/configuration/configure_graphics.cpp | 1 +
 src/yuzu/configuration/shared_translation.cpp | 1 +
 src/yuzu/configuration/shared_widget.cpp      | 1 +
 6 files changed, 6 insertions(+)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 384a8ecb6..29dad27fc 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -12,6 +12,7 @@
 #include <stdexcept>
 #include <string>
 #include <typeindex>
+#include <typeinfo>
 #include <utility>
 #include <vector>
 
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index 2710f136d..f3d76b927 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -7,6 +7,7 @@
 #include <string>
 #include <type_traits>
 #include <typeindex>
+#include <typeinfo>
 #include "common/common_types.h"
 
 namespace Settings {
diff --git a/src/yuzu/configuration/configure_cpu.cpp b/src/yuzu/configuration/configure_cpu.cpp
index 159837ebd..3f321039f 100644
--- a/src/yuzu/configuration/configure_cpu.cpp
+++ b/src/yuzu/configuration/configure_cpu.cpp
@@ -3,6 +3,7 @@
 
 #include <forward_list>
 #include <memory>
+#include <typeinfo>
 #include <QComboBox>
 #include "common/common_types.h"
 #include "common/settings.h"
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index c053da0cd..4d638a11b 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -7,6 +7,7 @@
 #include <iterator>
 #include <string>
 #include <tuple>
+#include <typeinfo>
 #include <utility>
 #include <vector>
 #include <QBoxLayout>
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 1787a35ff..0f9dc77ff 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -6,6 +6,7 @@
 #include <memory>
 #include <string>
 #include <typeindex>
+#include <typeinfo>
 #include <utility>
 #include <QString>
 #include <QWidget>
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index b83150f2b..c8d6b0a01 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -1,5 +1,6 @@
 #include <functional>
 #include <limits>
+#include <typeinfo>
 #include <QAbstractButton>
 #include <QAbstractSpinBox>
 #include <QBoxLayout>
-- 
cgit v1.2.3


From 02265f19d996f7266da7c4cba5c9d93ab3727f9f Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sat, 10 Jun 2023 23:39:47 -0400
Subject: settings: Remove redundant false literals

---
 src/common/settings.h | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 29dad27fc..ec0686120 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -625,8 +625,8 @@ struct Values {
                                                   Category::Renderer};
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{
         linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
-    SwitchableSetting<bool, false> use_speed_limit{
-        linkage, true, "use_speed_limit", Category::Renderer, false, true};
+    SwitchableSetting<bool> use_speed_limit{linkage, true, "use_speed_limit", Category::Renderer,
+                                            false,   true};
     SwitchableSetting<u16, true> speed_limit{
         linkage, 100, 0, 9999, "speed_limit", Category::Renderer, true, true};
     SwitchableSetting<AstcDecodeMode, true> accelerate_astc{linkage,
@@ -671,9 +671,9 @@ struct Values {
     ResolutionScalingInfo resolution_info{};
     SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
                                                         "resolution_setup", Category::Renderer};
-    SwitchableSetting<ScalingFilter, false> scaling_filter{
+    SwitchableSetting<ScalingFilter> scaling_filter{
         linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer, true, true};
-    SwitchableSetting<AntiAliasing, false> anti_aliasing{
+    SwitchableSetting<AntiAliasing> anti_aliasing{
         linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer, true, true};
     SwitchableSetting<int, true> fsr_sharpening_slider{
         linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer, true, true};
@@ -707,9 +707,9 @@ struct Values {
                                                   Category::RendererAdvanced};
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::RendererAdvanced};
-    SwitchableSetting<bool, false> use_fast_gpu_time{
+    SwitchableSetting<bool> use_fast_gpu_time{
         linkage, true, "use_fast_gpu_time", Category::RendererAdvanced, true, true};
-    SwitchableSetting<bool, false> use_vulkan_driver_pipeline_cache{
+    SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{
         linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced, true, true};
     SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
                                                      Category::RendererAdvanced};
@@ -756,12 +756,12 @@ struct Values {
     // Controls
     InputSetting<std::array<PlayerInput, 10>> players;
 
-    Setting<bool, false> enable_raw_input{linkage, false, "enable_raw_input", Category::Controls,
+    Setting<bool> enable_raw_input{linkage, false, "enable_raw_input", Category::Controls,
 // Only read/write enable_raw_input on Windows platforms
 #ifdef _WIN32
-                                          true
+                                   true
 #else
-                                          false
+                                   false
 #endif
     };
     Setting<bool> controller_navigation{linkage, true, "controller_navigation", Category::Controls};
@@ -783,7 +783,7 @@ struct Values {
     Setting<bool> tas_enable{linkage, false, "tas_enable", Category::Controls};
     Setting<bool> tas_loop{linkage, false, "tas_loop", Category::Controls};
 
-    Setting<bool, false> mouse_panning{linkage, false, "mouse_panning", Category::Controls, false};
+    Setting<bool> mouse_panning{linkage, false, "mouse_panning", Category::Controls, false};
     Setting<u8, true> mouse_panning_sensitivity{
         linkage, 50, 1, 100, "mouse_panning_sensitivity", Category::Controls};
     Setting<bool> mouse_enabled{linkage, false, "mouse_enabled", Category::Controls};
@@ -839,22 +839,19 @@ struct Values {
     Setting<std::string> program_args{linkage, std::string(), "program_args", Category::Debugging};
     Setting<bool> dump_exefs{linkage, false, "dump_exefs", Category::Debugging};
     Setting<bool> dump_nso{linkage, false, "dump_nso", Category::Debugging};
-    Setting<bool, false> dump_shaders{linkage, false, "dump_shaders", Category::DebuggingGraphics,
-                                      false};
-    Setting<bool, false> dump_macros{linkage, false, "dump_macros", Category::DebuggingGraphics,
-                                     false};
+    Setting<bool> dump_shaders{linkage, false, "dump_shaders", Category::DebuggingGraphics, false};
+    Setting<bool> dump_macros{linkage, false, "dump_macros", Category::DebuggingGraphics, false};
     Setting<bool> enable_fs_access_log{linkage, false, "enable_fs_access_log", Category::Debugging};
-    Setting<bool, false> reporting_services{linkage, false, "reporting_services",
-                                            Category::Debugging, false};
+    Setting<bool> reporting_services{linkage, false, "reporting_services", Category::Debugging,
+                                     false};
     Setting<bool> quest_flag{linkage, false, "quest_flag", Category::Debugging};
     Setting<bool> disable_macro_jit{linkage, false, "disable_macro_jit",
                                     Category::DebuggingGraphics};
     Setting<bool> disable_macro_hle{linkage, false, "disable_macro_hle",
                                     Category::DebuggingGraphics};
-    Setting<bool, false> extended_logging{linkage, false, "extended_logging", Category::Debugging,
-                                          false};
+    Setting<bool> extended_logging{linkage, false, "extended_logging", Category::Debugging, false};
     Setting<bool> use_debug_asserts{linkage, false, "use_debug_asserts", Category::Debugging};
-    Setting<bool, false> use_auto_stub{linkage, false, "use_auto_stub", Category::Debugging, false};
+    Setting<bool> use_auto_stub{linkage, false, "use_auto_stub", Category::Debugging, false};
     Setting<bool> enable_all_controllers{linkage, false, "enable_all_controllers",
                                          Category::Debugging};
     Setting<bool> create_crash_dumps{linkage, false, "create_crash_dumps", Category::Debugging};
-- 
cgit v1.2.3


From 04d4b6ab802a1238eaca6c0a16d1a739503b81d9 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sat, 10 Jun 2023 23:40:39 -0400
Subject: (ui,)settings: Use explicit instantiation

Reduces compile times a tad on clang.
---
 src/audio_core/sink/sink_details.h       |   5 +-
 src/common/CMakeLists.txt                |   2 +
 src/common/settings.cpp                  |  52 ++++
 src/common/settings.h                    | 513 +++----------------------------
 src/common/settings_common.h             |  78 +++++
 src/common/settings_setting.h            | 413 +++++++++++++++++++++++++
 src/yuzu/configuration/config.cpp        |   6 +-
 src/yuzu/configuration/shared_widget.cpp |   3 +
 src/yuzu/uisettings.cpp                  |  10 +
 src/yuzu/uisettings.h                    |  10 +
 10 files changed, 615 insertions(+), 477 deletions(-)
 create mode 100644 src/common/settings_common.h
 create mode 100644 src/common/settings_setting.h

(limited to 'src/common')

diff --git a/src/audio_core/sink/sink_details.h b/src/audio_core/sink/sink_details.h
index 44403db71..c8498842b 100644
--- a/src/audio_core/sink/sink_details.h
+++ b/src/audio_core/sink/sink_details.h
@@ -3,13 +3,12 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
+#include "common/settings_enums.h"
 
-namespace Settings {
-enum class AudioEngine : u32;
-}
 namespace AudioCore {
 class AudioManager;
 
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 5902dd617..3c8368bb2 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -110,9 +110,11 @@ add_library(common STATIC
     scratch_buffer.h
     settings.cpp
     settings.h
+    settings_common.h
     settings_enums.h
     settings_input.cpp
     settings_input.h
+    settings_setting.h
     socket_types.h
     spin_lock.cpp
     spin_lock.h
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 84e90f893..10cdea844 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -7,10 +7,17 @@
 #include <exception>
 #include <stdexcept>
 #endif
+#include <compare>
+#include <cstddef>
+#include <filesystem>
+#include <forward_list>
 #include <functional>
 #include <string_view>
+#include <type_traits>
+#include <fmt/core.h>
 
 #include "common/assert.h"
+#include "common/fs/fs_util.h"
 #include "common/fs/path_util.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
@@ -18,6 +25,43 @@
 
 namespace Settings {
 
+#define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>
+#define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>
+
+SETTING(AudioEngine, false);
+SETTING(bool, false);
+SETTING(int, false);
+SETTING(std::string, false);
+SETTING(u16, false);
+SWITCHABLE(AnisotropyMode, true);
+SWITCHABLE(AntiAliasing, false);
+SWITCHABLE(AspectRatio, true);
+SWITCHABLE(AstcDecodeMode, true);
+SWITCHABLE(AstcRecompression, true);
+SWITCHABLE(AudioMode, true);
+SWITCHABLE(CpuAccuracy, true);
+SWITCHABLE(FullscreenMode, true);
+SWITCHABLE(GpuAccuracy, true);
+SWITCHABLE(Language, true);
+SWITCHABLE(NvdecEmulation, false);
+SWITCHABLE(Region, true);
+SWITCHABLE(RendererBackend, true);
+SWITCHABLE(ScalingFilter, false);
+SWITCHABLE(ShaderBackend, true);
+SWITCHABLE(TimeZone, true);
+SETTING(VSyncMode, true);
+SWITCHABLE(bool, false);
+SWITCHABLE(int, false);
+SWITCHABLE(int, true);
+SWITCHABLE(s64, false);
+SWITCHABLE(u16, true);
+SWITCHABLE(u32, false);
+SWITCHABLE(u8, false);
+SWITCHABLE(u8, true);
+
+#undef SETTING
+#undef SWITCHABLE
+
 Values values;
 static bool configuring_global = true;
 
@@ -238,6 +282,14 @@ void UpdateRescalingInfo() {
     info.active = info.up_scale != 1 || info.down_shift != 0;
 }
 
+std::string BasicSetting::ToStringGlobal() const {
+    return {};
+}
+
+bool BasicSetting::UsingGlobal() const {
+    return true;
+}
+
 void RestoreGlobalState(bool is_powered_on) {
     // If a game is running, DO NOT restore the global settings state
     if (is_powered_on) {
diff --git a/src/common/settings.h b/src/common/settings.h
index ec0686120..e03233eaf 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -5,54 +5,21 @@
 
 #include <algorithm>
 #include <array>
-#include <forward_list>
-#include <functional>
 #include <map>
-#include <optional>
+#include <memory>
 #include <stdexcept>
 #include <string>
-#include <typeindex>
-#include <typeinfo>
 #include <utility>
 #include <vector>
 
 #include "common/common_types.h"
+#include "common/settings_common.h"
 #include "common/settings_enums.h"
 #include "common/settings_input.h"
+#include "common/settings_setting.h"
 
 namespace Settings {
 
-enum class Category : u32 {
-    Audio,
-    Core,
-    Cpu,
-    CpuDebug,
-    CpuUnsafe,
-    Renderer,
-    RendererAdvanced,
-    RendererDebug,
-    System,
-    SystemAudio,
-    DataStorage,
-    Debugging,
-    DebuggingGraphics,
-    Miscellaneous,
-    Network,
-    WebService,
-    AddOns,
-    Controls,
-    Ui,
-    UiGeneral,
-    UiLayout,
-    UiGameList,
-    Screenshots,
-    Shortcuts,
-    Multiplayer,
-    Services,
-    Paths,
-    MaxEnum,
-};
-
 const char* TranslateCategory(Settings::Category category);
 
 struct ResolutionScalingInfo {
@@ -78,441 +45,45 @@ struct ResolutionScalingInfo {
     }
 };
 
-class BasicSetting {
-protected:
-    explicit BasicSetting() = default;
-
-public:
-    virtual ~BasicSetting() = default;
-
-    virtual Category Category() const = 0;
-    virtual constexpr bool Switchable() const = 0;
-    virtual std::string ToString() const = 0;
-    virtual std::string ToStringGlobal() const {
-        return {};
-    }
-    virtual void LoadString(const std::string& load) = 0;
-    virtual std::string Canonicalize() const = 0;
-    virtual const std::string& GetLabel() const = 0;
-    virtual std::string DefaultToString() const = 0;
-    virtual bool Save() const = 0;
-    virtual std::type_index TypeId() const = 0;
-    virtual constexpr bool IsEnum() const = 0;
-    virtual bool RuntimeModfiable() const = 0;
-    virtual void SetGlobal(bool global) {}
-    virtual constexpr u32 Id() const = 0;
-    virtual std::string MinVal() const = 0;
-    virtual std::string MaxVal() const = 0;
-    virtual bool UsingGlobal() const {
-        return true;
-    }
-};
-
-class Linkage {
-public:
-    explicit Linkage(u32 initial_count = 0);
-    ~Linkage();
-    std::map<Category, std::forward_list<BasicSetting*>> by_category{};
-    std::vector<std::function<void()>> restore_functions{};
-    u32 count;
-};
-
-/** 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, bool ranged = false>
-class Setting : public BasicSetting {
-protected:
-    Setting() = default;
-
-    /**
-     * Only sets the setting to the given initializer, leaving the other members to their default
-     * initializers.
-     *
-     * @param global_val Initial value of the setting
-     */
-    explicit Setting(const Type& val) : value{val} {}
-
-public:
-    /**
-     * Sets a default value, label, and setting value.
-     *
-     * @param linkage Setting registry
-     * @param default_val Initial value of the setting, and default value of the setting
-     * @param name Label for the setting
-     * @param category_ Category of the setting AKA INI group
-     */
-    explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
-                     enum Category category_, bool save_ = true, bool runtime_modifiable_ = false)
-        requires(!ranged)
-        : value{default_val}, default_value{default_val}, label{name}, category{category_},
-          id{linkage.count}, save{save_}, runtime_modifiable{runtime_modifiable_} {
-        linkage.by_category[category].push_front(this);
-        linkage.count++;
-    }
-    virtual ~Setting() = default;
-
-    /**
-     * Sets a default value, minimum value, maximum value, and label.
-     *
-     * @param linkage Setting registry
-     * @param default_val Initial 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
-     * @param category_ Category of the setting AKA INI group
-     */
-    explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
-                     const Type& max_val, const std::string& name, enum Category category_,
-                     bool save_ = true, bool runtime_modifiable_ = false)
-        requires(ranged)
-        : value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val},
-          label{name}, category{category_}, id{linkage.count}, save{save_},
-          runtime_modifiable{runtime_modifiable_} {
-        linkage.by_category[category].push_front(this);
-        linkage.count++;
-    }
-
-    /**
-     *  Returns a reference to the setting's value.
-     *
-     * @returns A reference to the setting
-     */
-    [[nodiscard]] virtual const Type& GetValue() const {
-        return value;
-    }
-
-    /**
-     * Sets the setting to the given value.
-     *
-     * @param val The desired value
-     */
-    virtual void SetValue(const Type& val) {
-        Type temp{ranged ? std::clamp(val, minimum, maximum) : val};
-        std::swap(value, temp);
-    }
-
-    /**
-     * Returns the value that this setting was created with.
-     *
-     * @returns A reference to the default value
-     */
-    [[nodiscard]] const Type& GetDefault() const {
-        return default_value;
-    }
-
-    /**
-     * Returns the label this setting was created with.
-     *
-     * @returns A reference to the label
-     */
-    [[nodiscard]] const std::string& GetLabel() const override {
-        return label;
-    }
-
-    /**
-     * Returns the setting's category AKA INI group.
-     *
-     * @returns The setting's category
-     */
-    [[nodiscard]] enum Category Category() const override {
-        return category;
-    }
-
-    [[nodiscard]] bool RuntimeModfiable() const override {
-        return runtime_modifiable;
-    }
-
-    [[nodiscard]] constexpr bool IsEnum() const override {
-        return std::is_enum<Type>::value;
-    }
-
-    /**
-     * Returns whether the current setting is Switchable.
-     *
-     * @returns If the setting is a SwitchableSetting
-     */
-    [[nodiscard]] virtual constexpr bool Switchable() const override {
-        return false;
-    }
-
-protected:
-    std::string ToString(const Type& value_) const {
-        if constexpr (std::is_same<Type, std::string>()) {
-            return value_;
-        } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
-            return value_.has_value() ? std::to_string(*value_) : "none";
-        } else if constexpr (std::is_same<Type, bool>()) {
-            return value_ ? "true" : "false";
-        } else if (std::is_same<Type, AudioEngine>()) {
-            return CanonicalizeEnum(value_);
-        } else {
-            return std::to_string(static_cast<u64>(value_));
-        }
-    }
-
-public:
-    /**
-     * Converts the value of the setting to a std::string. Respects the global state if the setting
-     * has one.
-     *
-     * @returns The current setting as a std::string
-     */
-    std::string ToString() const override {
-        return ToString(this->GetValue());
-    }
-
-    /**
-     * Returns the default value of the setting as a std::string.
-     *
-     * @returns The default value as a string.
-     */
-    std::string DefaultToString() const override {
-        return ToString(default_value);
-    }
-
-    /**
-     * Assigns a value to the setting.
-     *
-     * @param val The desired setting value
-     *
-     * @returns A reference to the setting
-     */
-    virtual const Type& operator=(const Type& val) {
-        Type temp{ranged ? std::clamp(val, minimum, maximum) : val};
-        std::swap(value, temp);
-        return value;
-    }
-
-    /**
-     * Returns a reference to the setting.
-     *
-     * @returns A reference to the setting
-     */
-    explicit virtual operator const Type&() const {
-        return value;
-    }
-
-    /**
-     * Converts the given value to the Setting's type of value. Uses SetValue to enter the setting,
-     * thus respecting its constraints.
-     *
-     * @param input The desired value
-     */
-    void LoadString(const std::string& input) override {
-        if (input.empty()) {
-            this->SetValue(this->GetDefault());
-            return;
-        }
-        try {
-            if constexpr (std::is_same<Type, std::string>()) {
-                this->SetValue(input);
-            } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
-                this->SetValue(static_cast<u32>(std::stoul(input)));
-            } else if constexpr (std::is_same<Type, bool>()) {
-                this->SetValue(input == "true");
-            } else if constexpr (std::is_same<Type, AudioEngine>()) {
-                this->SetValue(ToEnum<Type>(input));
-            } else {
-                this->SetValue(static_cast<Type>(std::stoll(input)));
-            }
-        } catch (std::invalid_argument) {
-            this->SetValue(this->GetDefault());
-        }
-    }
-
-    [[nodiscard]] std::string constexpr Canonicalize() const override {
-        if constexpr (std::is_enum<Type>::value) {
-            return CanonicalizeEnum(this->GetValue());
-        }
-        return ToString(this->GetValue());
-    }
-
-    /**
-     * Returns the save preference of the setting i.e. when saving or reading the setting from a
-     * frontend, whether this setting should be skipped.
-     *
-     * @returns The save preference
-     */
-    virtual bool Save() const override {
-        return save;
-    }
-
-    /**
-     * Gives us another way to identify the setting without having to go through a string.
-     *
-     * @returns the type_index of the setting's type
-     */
-    virtual std::type_index TypeId() const override {
-        return std::type_index(typeid(Type));
-    }
-
-    virtual constexpr u32 Id() const override {
-        return id;
-    }
-
-    virtual std::string MinVal() const override {
-        return this->ToString(minimum);
-    }
-    virtual std::string MaxVal() const override {
-        return this->ToString(maximum);
-    }
-
-protected:
-    Type value{};                 ///< The setting
-    const Type default_value{};   ///< The default value
-    const Type maximum{};         ///< Maximum allowed value of the setting
-    const Type minimum{};         ///< Minimum allowed value of the setting
-    const std::string label{};    ///< The setting's label
-    const enum Category category; ///< The setting's category AKA INI group
-    const u32 id;
-    bool save;
-    bool runtime_modifiable;
-};
-
-/**
- * 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.
- */
-template <typename Type, bool ranged = false>
-class SwitchableSetting : virtual public Setting<Type, ranged> {
-public:
-    /**
-     * Sets a default value, label, and setting value.
-     *
-     * @param linkage Setting registry
-     * @param default_val Initial value of the setting, and default value of the setting
-     * @param name Label for the setting
-     * @param category_ Category of the setting AKA INI group
-     */
-    explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
-                               Category category, bool save = true, bool runtime_modifiable = false)
-        requires(!ranged)
-        : Setting<Type, false>{linkage, default_val, name, category, save, runtime_modifiable} {
-        linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
-    }
-    virtual ~SwitchableSetting() = default;
-
-    /**
-     * Sets a default value, minimum value, maximum value, and label.
-     *
-     * @param linkage Setting registry
-     * @param default_val Initial 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
-     * @param category_ Category of the setting AKA INI group
-     */
-    explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
-                               const Type& max_val, const std::string& name, Category category,
-                               bool save = true, bool runtime_modifiable = false)
-        requires(ranged)
-        : Setting<Type, true>{linkage, default_val, min_val, max_val,
-                              name,    category,    save,    runtime_modifiable} {
-        linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
-    }
-
-    /**
-     * Tells this setting to represent either the global or custom setting when other member
-     * functions are used.
-     *
-     * @param to_global Whether to use the global or custom setting.
-     */
-    void SetGlobal(bool to_global) override {
-        use_global = to_global;
-    }
-
-    /**
-     * Returns whether this setting is using the global setting or not.
-     *
-     * @returns The global state
-     */
-    [[nodiscard]] bool UsingGlobal() const override {
-        return use_global;
-    }
-
-    /**
-     * Returns either the global or custom setting depending on the values of this setting's global
-     * state or if the global value was specifically requested.
-     *
-     * @param need_global Request global value regardless of setting's state; defaults to false
-     *
-     * @returns The required value of the setting
-     */
-    [[nodiscard]] virtual const Type& GetValue() const override {
-        if (use_global) {
-            return this->value;
-        }
-        return custom;
-    }
-    [[nodiscard]] virtual const Type& GetValue(bool need_global) const {
-        if (use_global || need_global) {
-            return this->value;
-        }
-        return custom;
-    }
-
-    /**
-     * Sets the current setting value depending on the global state.
-     *
-     * @param val The new value
-     */
-    void SetValue(const Type& val) override {
-        Type temp{ranged ? std::clamp(val, this->minimum, this->maximum) : val};
-        if (use_global) {
-            std::swap(this->value, temp);
-        } else {
-            std::swap(custom, temp);
-        }
-    }
-
-    [[nodiscard]] virtual constexpr bool Switchable() const override {
-        return true;
-    }
-
-    [[nodiscard]] virtual std::string ToStringGlobal() const override {
-        return this->ToString(this->value);
-    }
-
-    /**
-     * Assigns the current setting value depending on the global state.
-     *
-     * @param val The new value
-     *
-     * @returns A reference to the current setting value
-     */
-    const Type& operator=(const Type& val) override {
-        Type temp{ranged ? std::clamp(val, this->minimum, this->maximum) : val};
-        if (use_global) {
-            std::swap(this->value, temp);
-            return this->value;
-        }
-        std::swap(custom, temp);
-        return custom;
-    }
-
-    /**
-     * Returns the current setting value depending on the global state.
-     *
-     * @returns A reference to the current setting value
-     */
-    virtual explicit operator const Type&() const override {
-        if (use_global) {
-            return this->value;
-        }
-        return custom;
-    }
-
-protected:
-    bool use_global{true}; ///< The setting's global state
-    Type custom{};         ///< The custom value of the setting
-};
+// Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work
+#define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED>
+#define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED>
+
+SETTING(AudioEngine, false);
+SETTING(bool, false);
+SETTING(int, false);
+SETTING(s32, false);
+SETTING(std::string, false);
+SETTING(std::string, false);
+SETTING(u16, false);
+SWITCHABLE(AnisotropyMode, true);
+SWITCHABLE(AntiAliasing, false);
+SWITCHABLE(AspectRatio, true);
+SWITCHABLE(AstcDecodeMode, true);
+SWITCHABLE(AstcRecompression, true);
+SWITCHABLE(AudioMode, true);
+SWITCHABLE(CpuAccuracy, true);
+SWITCHABLE(FullscreenMode, true);
+SWITCHABLE(GpuAccuracy, true);
+SWITCHABLE(Language, true);
+SWITCHABLE(NvdecEmulation, false);
+SWITCHABLE(Region, true);
+SWITCHABLE(RendererBackend, true);
+SWITCHABLE(ScalingFilter, false);
+SWITCHABLE(ShaderBackend, true);
+SWITCHABLE(TimeZone, true);
+SETTING(VSyncMode, true);
+SWITCHABLE(bool, false);
+SWITCHABLE(int, false);
+SWITCHABLE(int, true);
+SWITCHABLE(s64, false);
+SWITCHABLE(u16, true);
+SWITCHABLE(u32, false);
+SWITCHABLE(u8, false);
+SWITCHABLE(u8, true);
+
+#undef SETTING
+#undef SWITCHABLE
 
 /**
  * The InputSetting class allows for getting a reference to either the global or custom members.
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
new file mode 100644
index 000000000..93fddeba6
--- /dev/null
+++ b/src/common/settings_common.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include <forward_list>
+#include <functional>
+#include <map>
+#include <string>
+#include <typeindex>
+#include "common/common_types.h"
+
+namespace Settings {
+
+enum class Category : u32 {
+    Audio,
+    Core,
+    Cpu,
+    CpuDebug,
+    CpuUnsafe,
+    Renderer,
+    RendererAdvanced,
+    RendererDebug,
+    System,
+    SystemAudio,
+    DataStorage,
+    Debugging,
+    DebuggingGraphics,
+    Miscellaneous,
+    Network,
+    WebService,
+    AddOns,
+    Controls,
+    Ui,
+    UiGeneral,
+    UiLayout,
+    UiGameList,
+    Screenshots,
+    Shortcuts,
+    Multiplayer,
+    Services,
+    Paths,
+    MaxEnum,
+};
+
+class BasicSetting {
+protected:
+    explicit BasicSetting() = default;
+
+public:
+    virtual ~BasicSetting() = default;
+
+    virtual Category Category() const = 0;
+    virtual constexpr bool Switchable() const = 0;
+    virtual std::string ToString() const = 0;
+    virtual std::string ToStringGlobal() const;
+    virtual void LoadString(const std::string& load) = 0;
+    virtual std::string Canonicalize() const = 0;
+    virtual const std::string& GetLabel() const = 0;
+    virtual std::string DefaultToString() const = 0;
+    virtual bool Save() const = 0;
+    virtual std::type_index TypeId() const = 0;
+    virtual constexpr bool IsEnum() const = 0;
+    virtual bool RuntimeModfiable() const = 0;
+    virtual void SetGlobal(bool global) {}
+    virtual constexpr u32 Id() const = 0;
+    virtual std::string MinVal() const = 0;
+    virtual std::string MaxVal() const = 0;
+    virtual bool UsingGlobal() const;
+};
+
+class Linkage {
+public:
+    explicit Linkage(u32 initial_count = 0);
+    ~Linkage();
+    std::map<Category, std::forward_list<BasicSetting*>> by_category{};
+    std::vector<std::function<void()>> restore_functions{};
+    u32 count;
+};
+
+} // namespace Settings
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
new file mode 100644
index 000000000..f226e38d4
--- /dev/null
+++ b/src/common/settings_setting.h
@@ -0,0 +1,413 @@
+#pragma once
+
+#include <map>
+#include <optional>
+#include <string>
+#include <typeindex>
+#include <typeinfo>
+#include "common/common_types.h"
+#include "common/settings_common.h"
+#include "common/settings_enums.h"
+
+namespace Settings {
+
+/** 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, bool ranged = false>
+class Setting : public BasicSetting {
+protected:
+    Setting() = default;
+
+    /**
+     * Only sets the setting to the given initializer, leaving the other members to their default
+     * initializers.
+     *
+     * @param global_val Initial value of the setting
+     */
+    explicit Setting(const Type& val)
+        : value{val},
+          default_value{}, maximum{}, minimum{}, label{}, category{Category::Miscellaneous}, id{} {}
+
+public:
+    /**
+     * Sets a default value, label, and setting value.
+     *
+     * @param linkage Setting registry
+     * @param default_val Initial value of the setting, and default value of the setting
+     * @param name Label for the setting
+     * @param category_ Category of the setting AKA INI group
+     */
+    explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
+                     enum Category category_, bool save_ = true, bool runtime_modifiable_ = false)
+        requires(!ranged)
+        : value{default_val}, default_value{default_val}, label{name}, category{category_},
+          id{linkage.count}, save{save_}, runtime_modifiable{runtime_modifiable_} {
+        linkage.by_category[category].push_front(this);
+        linkage.count++;
+    }
+    virtual ~Setting() = default;
+
+    /**
+     * Sets a default value, minimum value, maximum value, and label.
+     *
+     * @param linkage Setting registry
+     * @param default_val Initial 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
+     * @param category_ Category of the setting AKA INI group
+     */
+    explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
+                     const Type& max_val, const std::string& name, enum Category category_,
+                     bool save_ = true, bool runtime_modifiable_ = false)
+        requires(ranged)
+        : value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val},
+          label{name}, category{category_}, id{linkage.count}, save{save_},
+          runtime_modifiable{runtime_modifiable_} {
+        linkage.by_category[category].push_front(this);
+        linkage.count++;
+    }
+
+    /**
+     *  Returns a reference to the setting's value.
+     *
+     * @returns A reference to the setting
+     */
+    [[nodiscard]] virtual const Type& GetValue() const {
+        return value;
+    }
+
+    /**
+     * Sets the setting to the given value.
+     *
+     * @param val The desired value
+     */
+    virtual void SetValue(const Type& val) {
+        Type temp{ranged ? std::clamp(val, minimum, maximum) : val};
+        std::swap(value, temp);
+    }
+
+    /**
+     * Returns the value that this setting was created with.
+     *
+     * @returns A reference to the default value
+     */
+    [[nodiscard]] const Type& GetDefault() const {
+        return default_value;
+    }
+
+    /**
+     * Returns the label this setting was created with.
+     *
+     * @returns A reference to the label
+     */
+    [[nodiscard]] const std::string& GetLabel() const override {
+        return label;
+    }
+
+    /**
+     * Returns the setting's category AKA INI group.
+     *
+     * @returns The setting's category
+     */
+    [[nodiscard]] enum Category Category() const override {
+        return category;
+    }
+
+    [[nodiscard]] bool RuntimeModfiable() const override {
+        return runtime_modifiable;
+    }
+
+    [[nodiscard]] constexpr bool IsEnum() const override {
+        return std::is_enum<Type>::value;
+    }
+
+    /**
+     * Returns whether the current setting is Switchable.
+     *
+     * @returns If the setting is a SwitchableSetting
+     */
+    [[nodiscard]] virtual constexpr bool Switchable() const override {
+        return false;
+    }
+
+protected:
+    std::string ToString(const Type& value_) const {
+        if constexpr (std::is_same<Type, std::string>()) {
+            return value_;
+        } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
+            return value_.has_value() ? std::to_string(*value_) : "none";
+        } else if constexpr (std::is_same<Type, bool>()) {
+            return value_ ? "true" : "false";
+        } else if (std::is_same<Type, AudioEngine>()) {
+            return CanonicalizeEnum(value_);
+        } else {
+            return std::to_string(static_cast<u64>(value_));
+        }
+    }
+
+public:
+    /**
+     * Converts the value of the setting to a std::string. Respects the global state if the setting
+     * has one.
+     *
+     * @returns The current setting as a std::string
+     */
+    std::string ToString() const override {
+        return ToString(this->GetValue());
+    }
+
+    /**
+     * Returns the default value of the setting as a std::string.
+     *
+     * @returns The default value as a string.
+     */
+    std::string DefaultToString() const override {
+        return ToString(default_value);
+    }
+
+    /**
+     * Assigns a value to the setting.
+     *
+     * @param val The desired setting value
+     *
+     * @returns A reference to the setting
+     */
+    virtual const Type& operator=(const Type& val) {
+        Type temp{ranged ? std::clamp(val, minimum, maximum) : val};
+        std::swap(value, temp);
+        return value;
+    }
+
+    /**
+     * Returns a reference to the setting.
+     *
+     * @returns A reference to the setting
+     */
+    explicit virtual operator const Type&() const {
+        return value;
+    }
+
+    /**
+     * Converts the given value to the Setting's type of value. Uses SetValue to enter the setting,
+     * thus respecting its constraints.
+     *
+     * @param input The desired value
+     */
+    void LoadString(const std::string& input) override {
+        if (input.empty()) {
+            this->SetValue(this->GetDefault());
+            return;
+        }
+        try {
+            if constexpr (std::is_same<Type, std::string>()) {
+                this->SetValue(input);
+            } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
+                this->SetValue(static_cast<u32>(std::stoul(input)));
+            } else if constexpr (std::is_same<Type, bool>()) {
+                this->SetValue(input == "true");
+            } else if constexpr (std::is_same<Type, AudioEngine>()) {
+                this->SetValue(ToEnum<Type>(input));
+            } else {
+                this->SetValue(static_cast<Type>(std::stoll(input)));
+            }
+        } catch (std::invalid_argument) {
+            this->SetValue(this->GetDefault());
+        }
+    }
+
+    [[nodiscard]] std::string constexpr Canonicalize() const override {
+        if constexpr (std::is_enum<Type>::value) {
+            return CanonicalizeEnum(this->GetValue());
+        }
+        return ToString(this->GetValue());
+    }
+
+    /**
+     * Returns the save preference of the setting i.e. when saving or reading the setting from a
+     * frontend, whether this setting should be skipped.
+     *
+     * @returns The save preference
+     */
+    virtual bool Save() const override {
+        return save;
+    }
+
+    /**
+     * Gives us another way to identify the setting without having to go through a string.
+     *
+     * @returns the type_index of the setting's type
+     */
+    virtual std::type_index TypeId() const override {
+        return std::type_index(typeid(Type));
+    }
+
+    virtual constexpr u32 Id() const override {
+        return id;
+    }
+
+    virtual std::string MinVal() const override {
+        return this->ToString(minimum);
+    }
+    virtual std::string MaxVal() const override {
+        return this->ToString(maximum);
+    }
+
+protected:
+    Type value{};                 ///< The setting
+    const Type default_value{};   ///< The default value
+    const Type maximum{};         ///< Maximum allowed value of the setting
+    const Type minimum{};         ///< Minimum allowed value of the setting
+    const std::string label{};    ///< The setting's label
+    const enum Category category; ///< The setting's category AKA INI group
+    const u32 id;
+    bool save;
+    bool runtime_modifiable;
+};
+
+/**
+ * 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.
+ */
+template <typename Type, bool ranged = false>
+class SwitchableSetting : virtual public Setting<Type, ranged> {
+public:
+    /**
+     * Sets a default value, label, and setting value.
+     *
+     * @param linkage Setting registry
+     * @param default_val Initial value of the setting, and default value of the setting
+     * @param name Label for the setting
+     * @param category_ Category of the setting AKA INI group
+     */
+    explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
+                               Category category, bool save = true, bool runtime_modifiable = false)
+        requires(!ranged)
+        : Setting<Type, false>{linkage, default_val, name, category, save, runtime_modifiable} {
+        linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
+    }
+    virtual ~SwitchableSetting() = default;
+
+    /**
+     * Sets a default value, minimum value, maximum value, and label.
+     *
+     * @param linkage Setting registry
+     * @param default_val Initial 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
+     * @param category_ Category of the setting AKA INI group
+     */
+    explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
+                               const Type& max_val, const std::string& name, Category category,
+                               bool save = true, bool runtime_modifiable = false)
+        requires(ranged)
+        : Setting<Type, true>{linkage, default_val, min_val, max_val,
+                              name,    category,    save,    runtime_modifiable} {
+        linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
+    }
+
+    /**
+     * Tells this setting to represent either the global or custom setting when other member
+     * functions are used.
+     *
+     * @param to_global Whether to use the global or custom setting.
+     */
+    void SetGlobal(bool to_global) override {
+        use_global = to_global;
+    }
+
+    /**
+     * Returns whether this setting is using the global setting or not.
+     *
+     * @returns The global state
+     */
+    [[nodiscard]] bool UsingGlobal() const override {
+        return use_global;
+    }
+
+    /**
+     * Returns either the global or custom setting depending on the values of this setting's global
+     * state or if the global value was specifically requested.
+     *
+     * @param need_global Request global value regardless of setting's state; defaults to false
+     *
+     * @returns The required value of the setting
+     */
+    [[nodiscard]] virtual const Type& GetValue() const override {
+        if (use_global) {
+            return this->value;
+        }
+        return custom;
+    }
+    [[nodiscard]] virtual const Type& GetValue(bool need_global) const {
+        if (use_global || need_global) {
+            return this->value;
+        }
+        return custom;
+    }
+
+    /**
+     * Sets the current setting value depending on the global state.
+     *
+     * @param val The new value
+     */
+    void SetValue(const Type& val) override {
+        Type temp{ranged ? std::clamp(val, this->minimum, this->maximum) : val};
+        if (use_global) {
+            std::swap(this->value, temp);
+        } else {
+            std::swap(custom, temp);
+        }
+    }
+
+    [[nodiscard]] virtual constexpr bool Switchable() const override {
+        return true;
+    }
+
+    [[nodiscard]] virtual std::string ToStringGlobal() const override {
+        return this->ToString(this->value);
+    }
+
+    /**
+     * Assigns the current setting value depending on the global state.
+     *
+     * @param val The new value
+     *
+     * @returns A reference to the current setting value
+     */
+    const Type& operator=(const Type& val) override {
+        Type temp{ranged ? std::clamp(val, this->minimum, this->maximum) : val};
+        if (use_global) {
+            std::swap(this->value, temp);
+            return this->value;
+        }
+        std::swap(custom, temp);
+        return custom;
+    }
+
+    /**
+     * Returns the current setting value depending on the global state.
+     *
+     * @returns A reference to the current setting value
+     */
+    virtual explicit operator const Type&() const override {
+        if (use_global) {
+            return this->value;
+        }
+        return custom;
+    }
+
+protected:
+    bool use_global{true}; ///< The setting's global state
+    Type custom{};         ///< The custom value of the setting
+};
+
+} // namespace Settings
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 051756452..ba1847976 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -102,9 +102,9 @@ const std::map<Settings::RendererBackend, QString> Config::renderer_backend_text
 };
 
 const std::map<Settings::ShaderBackend, QString> Config::shader_backend_texts_map = {
-    {Settings::ShaderBackend::GLSL, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "GLSL"))},
-    {Settings::ShaderBackend::GLASM, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "GLASM"))},
-    {Settings::ShaderBackend::SPIRV, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "SPIRV"))},
+    {Settings::ShaderBackend::Glsl, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "GLSL"))},
+    {Settings::ShaderBackend::Glasm, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "GLASM"))},
+    {Settings::ShaderBackend::SpirV, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "SPIRV"))},
 };
 
 // This shouldn't have anything except static initializers (no functions). So
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index efb3b329c..6142c3cb9 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -21,7 +21,10 @@
 #include <QStyle>
 #include <QValidator>
 #include <QWidget>
+#include <fmt/core.h>
+#include "common/assert.h"
 #include "common/common_types.h"
+#include "common/logging/log.h"
 #include "common/settings.h"
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/shared_translation.h"
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 2c1b547fb..2a02a27bc 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -3,6 +3,16 @@
 
 #include "yuzu/uisettings.h"
 
+namespace Settings {
+template class Setting<bool>;
+template class Setting<std::string>;
+template class Setting<u16, true>;
+template class Setting<u32>;
+template class Setting<u8, true>;
+template class Setting<u8>;
+template class Setting<unsigned long long>;
+} // namespace Settings
+
 namespace UISettings {
 
 const Themes themes{{
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index a734513ea..2152b0b3b 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -17,6 +17,16 @@
 using Settings::Category;
 using Settings::Setting;
 
+namespace Settings {
+extern template class Setting<bool>;
+extern template class Setting<std::string>;
+extern template class Setting<u16, true>;
+extern template class Setting<u32>;
+extern template class Setting<u8, true>;
+extern template class Setting<u8>;
+extern template class Setting<unsigned long long>;
+} // namespace Settings
+
 namespace UISettings {
 
 bool IsDarkTheme();
-- 
cgit v1.2.3


From 4903f40efe7b0c193309708ea01bd6abea8bac16 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 11 Jun 2023 00:41:14 -0400
Subject: settings_setting: Fix errors

ToString didn't have a constexpr if statement where needed.
Canonicalize missed an else, causing unreachable code error on MSVC.
---
 src/common/settings_setting.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index f226e38d4..99a4bad01 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -142,7 +142,7 @@ protected:
             return value_.has_value() ? std::to_string(*value_) : "none";
         } else if constexpr (std::is_same<Type, bool>()) {
             return value_ ? "true" : "false";
-        } else if (std::is_same<Type, AudioEngine>()) {
+        } else if constexpr (std::is_same<Type, AudioEngine>()) {
             return CanonicalizeEnum(value_);
         } else {
             return std::to_string(static_cast<u64>(value_));
@@ -222,8 +222,9 @@ public:
     [[nodiscard]] std::string constexpr Canonicalize() const override {
         if constexpr (std::is_enum<Type>::value) {
             return CanonicalizeEnum(this->GetValue());
+        } else {
+            return ToString(this->GetValue());
         }
-        return ToString(this->GetValue());
     }
 
     /**
-- 
cgit v1.2.3


From 11e7e1b8cec5a665bdc6c9e702f83ad6ea35dd6b Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 12 Jun 2023 17:05:30 -0400
Subject: settings: Move some simple data to BasicSetting

Reduces the need for the compiler to duplicate this code, by about
100KB executable size.
---
 src/common/CMakeLists.txt      |  2 +
 src/common/settings.cpp        |  8 ----
 src/common/settings_common.cpp | 45 ++++++++++++++++++++
 src/common/settings_common.h   | 96 +++++++++++++++++++++++++++++++-----------
 src/common/settings_setting.h  | 86 +++++--------------------------------
 5 files changed, 129 insertions(+), 108 deletions(-)
 create mode 100644 src/common/settings_common.cpp

(limited to 'src/common')

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3c8368bb2..09e7e673e 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -110,6 +110,7 @@ add_library(common STATIC
     scratch_buffer.h
     settings.cpp
     settings.h
+    settings_common.cpp
     settings_common.h
     settings_enums.h
     settings_input.cpp
@@ -199,6 +200,7 @@ if (MSVC)
 else()
   target_compile_options(common PRIVATE
     $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
+    $<$<CXX_COMPILER_ID:Clang>:-Werror=unreachable-code-aggressive>
   )
 endif()
 
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 10cdea844..d98dd2925 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -282,14 +282,6 @@ void UpdateRescalingInfo() {
     info.active = info.up_scale != 1 || info.down_shift != 0;
 }
 
-std::string BasicSetting::ToStringGlobal() const {
-    return {};
-}
-
-bool BasicSetting::UsingGlobal() const {
-    return true;
-}
-
 void RestoreGlobalState(bool is_powered_on) {
     // If a game is running, DO NOT restore the global settings state
     if (is_powered_on) {
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
new file mode 100644
index 000000000..a7ce99515
--- /dev/null
+++ b/src/common/settings_common.cpp
@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <string>
+#include "common/settings_common.h"
+
+namespace Settings {
+
+BasicSetting::BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
+                           bool save_, bool runtime_modifiable_)
+    : label{name}, category{category_}, id{linkage.count}, save{save_}, runtime_modifiable{
+                                                                            runtime_modifiable_} {
+    linkage.by_category[category].push_front(this);
+    linkage.count++;
+}
+
+BasicSetting::~BasicSetting() = default;
+
+std::string BasicSetting::ToStringGlobal() const {
+    return this->ToString();
+}
+
+bool BasicSetting::UsingGlobal() const {
+    return true;
+}
+
+void BasicSetting::SetGlobal(bool global) {}
+
+bool BasicSetting::Save() const {
+    return save;
+}
+
+bool BasicSetting::RuntimeModfiable() const {
+    return runtime_modifiable;
+}
+
+Category BasicSetting::Category() const {
+    return category;
+}
+
+const std::string& BasicSetting::GetLabel() const {
+    return label;
+}
+
+} // namespace Settings
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 93fddeba6..81d59115d 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include <forward_list>
@@ -40,31 +43,7 @@ enum class Category : u32 {
     MaxEnum,
 };
 
-class BasicSetting {
-protected:
-    explicit BasicSetting() = default;
-
-public:
-    virtual ~BasicSetting() = default;
-
-    virtual Category Category() const = 0;
-    virtual constexpr bool Switchable() const = 0;
-    virtual std::string ToString() const = 0;
-    virtual std::string ToStringGlobal() const;
-    virtual void LoadString(const std::string& load) = 0;
-    virtual std::string Canonicalize() const = 0;
-    virtual const std::string& GetLabel() const = 0;
-    virtual std::string DefaultToString() const = 0;
-    virtual bool Save() const = 0;
-    virtual std::type_index TypeId() const = 0;
-    virtual constexpr bool IsEnum() const = 0;
-    virtual bool RuntimeModfiable() const = 0;
-    virtual void SetGlobal(bool global) {}
-    virtual constexpr u32 Id() const = 0;
-    virtual std::string MinVal() const = 0;
-    virtual std::string MaxVal() const = 0;
-    virtual bool UsingGlobal() const;
-};
+class BasicSetting;
 
 class Linkage {
 public:
@@ -75,4 +54,71 @@ public:
     u32 count;
 };
 
+class BasicSetting {
+protected:
+    explicit BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
+                          bool save_, bool runtime_modifiable_);
+
+public:
+    virtual ~BasicSetting();
+
+    /* Data retrieval */
+
+    [[nodiscard]] virtual std::string ToString() const = 0;
+    [[nodiscard]] virtual std::string ToStringGlobal() const;
+    [[nodiscard]] virtual std::string DefaultToString() const = 0;
+    [[nodiscard]] virtual std::string MinVal() const = 0;
+    [[nodiscard]] virtual std::string MaxVal() const = 0;
+    virtual void LoadString(const std::string& load) = 0;
+    [[nodiscard]] virtual std::string Canonicalize() const = 0;
+
+    /* Identification */
+
+    [[nodiscard]] virtual std::type_index TypeId() const = 0;
+    [[nodiscard]] virtual constexpr bool IsEnum() const = 0;
+    /**
+     * Returns whether the current setting is Switchable.
+     *
+     * @returns If the setting is a SwitchableSetting
+     */
+    [[nodiscard]] virtual constexpr bool Switchable() const {
+        return false;
+    }
+    /**
+     * Returns the save preference of the setting i.e. when saving or reading the setting from a
+     * frontend, whether this setting should be skipped.
+     *
+     * @returns The save preference
+     */
+    [[nodiscard]] bool Save() const;
+    [[nodiscard]] bool RuntimeModfiable() const;
+    [[nodiscard]] constexpr u32 Id() const {
+        return id;
+    }
+    /**
+     * Returns the setting's category AKA INI group.
+     *
+     * @returns The setting's category
+     */
+    [[nodiscard]] Category Category() const;
+    /**
+     * Returns the label this setting was created with.
+     *
+     * @returns A reference to the label
+     */
+    [[nodiscard]] const std::string& GetLabel() const;
+
+    /* Switchable settings */
+
+    virtual void SetGlobal(bool global);
+    [[nodiscard]] virtual bool UsingGlobal() const;
+
+private:
+    const std::string label;      ///< The setting's label
+    const enum Category category; ///< The setting's category AKA INI group
+    const u32 id;
+    const bool save;
+    const bool runtime_modifiable;
+};
+
 } // namespace Settings
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 99a4bad01..1ca3acf18 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include <map>
@@ -21,16 +24,6 @@ class Setting : public BasicSetting {
 protected:
     Setting() = default;
 
-    /**
-     * Only sets the setting to the given initializer, leaving the other members to their default
-     * initializers.
-     *
-     * @param global_val Initial value of the setting
-     */
-    explicit Setting(const Type& val)
-        : value{val},
-          default_value{}, maximum{}, minimum{}, label{}, category{Category::Miscellaneous}, id{} {}
-
 public:
     /**
      * Sets a default value, label, and setting value.
@@ -43,11 +36,8 @@ public:
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
                      enum Category category_, bool save_ = true, bool runtime_modifiable_ = false)
         requires(!ranged)
-        : value{default_val}, default_value{default_val}, label{name}, category{category_},
-          id{linkage.count}, save{save_}, runtime_modifiable{runtime_modifiable_} {
-        linkage.by_category[category].push_front(this);
-        linkage.count++;
-    }
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_), value{default_val},
+          default_value{default_val} {}
     virtual ~Setting() = default;
 
     /**
@@ -64,12 +54,8 @@ public:
                      const Type& max_val, const std::string& name, enum Category category_,
                      bool save_ = true, bool runtime_modifiable_ = false)
         requires(ranged)
-        : value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val},
-          label{name}, category{category_}, id{linkage.count}, save{save_},
-          runtime_modifiable{runtime_modifiable_} {
-        linkage.by_category[category].push_front(this);
-        linkage.count++;
-    }
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_), value{default_val},
+          default_value{default_val}, maximum{max_val}, minimum{min_val} {}
 
     /**
      *  Returns a reference to the setting's value.
@@ -99,41 +85,10 @@ public:
         return default_value;
     }
 
-    /**
-     * Returns the label this setting was created with.
-     *
-     * @returns A reference to the label
-     */
-    [[nodiscard]] const std::string& GetLabel() const override {
-        return label;
-    }
-
-    /**
-     * Returns the setting's category AKA INI group.
-     *
-     * @returns The setting's category
-     */
-    [[nodiscard]] enum Category Category() const override {
-        return category;
-    }
-
-    [[nodiscard]] bool RuntimeModfiable() const override {
-        return runtime_modifiable;
-    }
-
     [[nodiscard]] constexpr bool IsEnum() const override {
         return std::is_enum<Type>::value;
     }
 
-    /**
-     * Returns whether the current setting is Switchable.
-     *
-     * @returns If the setting is a SwitchableSetting
-     */
-    [[nodiscard]] virtual constexpr bool Switchable() const override {
-        return false;
-    }
-
 protected:
     std::string ToString(const Type& value_) const {
         if constexpr (std::is_same<Type, std::string>()) {
@@ -227,16 +182,6 @@ public:
         }
     }
 
-    /**
-     * Returns the save preference of the setting i.e. when saving or reading the setting from a
-     * frontend, whether this setting should be skipped.
-     *
-     * @returns The save preference
-     */
-    virtual bool Save() const override {
-        return save;
-    }
-
     /**
      * Gives us another way to identify the setting without having to go through a string.
      *
@@ -246,10 +191,6 @@ public:
         return std::type_index(typeid(Type));
     }
 
-    virtual constexpr u32 Id() const override {
-        return id;
-    }
-
     virtual std::string MinVal() const override {
         return this->ToString(minimum);
     }
@@ -258,15 +199,10 @@ public:
     }
 
 protected:
-    Type value{};                 ///< The setting
-    const Type default_value{};   ///< The default value
-    const Type maximum{};         ///< Maximum allowed value of the setting
-    const Type minimum{};         ///< Minimum allowed value of the setting
-    const std::string label{};    ///< The setting's label
-    const enum Category category; ///< The setting's category AKA INI group
-    const u32 id;
-    bool save;
-    bool runtime_modifiable;
+    Type value{};               ///< The setting
+    const Type default_value{}; ///< The default value
+    const Type maximum{};       ///< Maximum allowed value of the setting
+    const Type minimum{};       ///< Minimum allowed value of the setting
 };
 
 /**
-- 
cgit v1.2.3


From b4f2ad3ff5c49549bc72997360c31d0662a97439 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 13 Jun 2023 19:37:41 -0400
Subject: settings: Move IsConfiguringGlobal to settings_common

---
 src/common/settings.cpp        |  9 ---------
 src/common/settings.h          |  3 ---
 src/common/settings_common.cpp | 10 ++++++++++
 src/common/settings_common.h   |  3 +++
 4 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index d98dd2925..a1cc76a38 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -63,7 +63,6 @@ SWITCHABLE(u8, true);
 #undef SWITCHABLE
 
 Values values;
-static bool configuring_global = true;
 
 std::string GetTimeZoneString() {
     const auto time_zone_index = static_cast<std::size_t>(values.time_zone_index.GetValue());
@@ -131,14 +130,6 @@ void LogSettings() {
     log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
 }
 
-bool IsConfiguringGlobal() {
-    return configuring_global;
-}
-
-void SetConfiguringGlobal(bool is_global) {
-    configuring_global = is_global;
-}
-
 bool IsGPULevelExtreme() {
     return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme;
 }
diff --git a/src/common/settings.h b/src/common/settings.h
index e03233eaf..afda3ccaf 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -450,9 +450,6 @@ struct Values {
 
 extern Values values;
 
-bool IsConfiguringGlobal();
-void SetConfiguringGlobal(bool is_global);
-
 bool IsGPULevelExtreme();
 bool IsGPULevelHigh();
 
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index a7ce99515..fb42991fa 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -42,4 +42,14 @@ const std::string& BasicSetting::GetLabel() const {
     return label;
 }
 
+static bool configuring_global = true;
+
+bool IsConfiguringGlobal() {
+    return configuring_global;
+}
+
+void SetConfiguringGlobal(bool is_global) {
+    configuring_global = is_global;
+}
+
 } // namespace Settings
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 81d59115d..9d1044a19 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -43,6 +43,9 @@ enum class Category : u32 {
     MaxEnum,
 };
 
+bool IsConfiguringGlobal();
+void SetConfiguringGlobal(bool is_global);
+
 class BasicSetting;
 
 class Linkage {
-- 
cgit v1.2.3


From 27e53990ed7100159cc08fd8470a9faecd011cbe Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 13 Jun 2023 19:37:54 -0400
Subject: settings: Document BasicSetting, add Ranged

---
 src/common/settings_common.h  | 115 ++++++++++++++++++++++++++++++++++++++----
 src/common/settings_setting.h |   4 ++
 2 files changed, 110 insertions(+), 9 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 9d1044a19..4d6d3021e 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -57,6 +57,10 @@ public:
     u32 count;
 };
 
+/**
+ * BasicSetting is an abstract class that only keeps track of metadata. The string methods are
+ * available to get data values out.
+ */
 class BasicSetting {
 protected:
     explicit BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
@@ -65,45 +69,117 @@ protected:
 public:
     virtual ~BasicSetting();
 
-    /* Data retrieval */
+    /*
+     * Data retrieval
+     */
 
+    /**
+     * Returns a string representation of the internal data. If the Setting is Switchable, it
+     * respects the internal global state: it is based on GetValue().
+     *
+     * @returns A string representation of the internal data.
+     */
     [[nodiscard]] virtual std::string ToString() const = 0;
+
+    /**
+     * Returns a string representation of the global version of internal data. If the Setting is
+     * not Switchable, it behaves like ToString.
+     *
+     * @returns A string representation of the global version of internal data.
+     */
     [[nodiscard]] virtual std::string ToStringGlobal() const;
+
+    /**
+     * @returns A string representation of the Setting's default value.
+     */
     [[nodiscard]] virtual std::string DefaultToString() const = 0;
+
+    /**
+     * Returns a string representation of the minimum value of the setting. If the Setting is not
+     * ranged, the string represents the default initialization of the data type.
+     *
+     * @returns A string representation of the minimum value of the setting.
+     */
     [[nodiscard]] virtual std::string MinVal() const = 0;
+
+    /**
+     * Returns a string representation of the maximum value of the setting. If the Setting is not
+     * ranged, the string represents the default initialization of the data type.
+     *
+     * @returns A string representation of the maximum value of the setting.
+     */
     [[nodiscard]] virtual std::string MaxVal() const = 0;
+
+    /**
+     * Takes a string input, converts it to the internal data type if necessary, and then runs
+     * SetValue with it.
+     *
+     * @param load String of the input data.
+     */
     virtual void LoadString(const std::string& load) = 0;
+
+    /**
+     * Returns a string representation of the data. If the data is an enum, it returns a string of
+     * the enum value. If the internal data type is not an enum, this is equivalent to ToString.
+     *
+     * e.g. renderer_backend.Canonicalize() == "OpenGL"
+     *
+     * @returns Canonicalized string representation of the internal data
+     */
     [[nodiscard]] virtual std::string Canonicalize() const = 0;
 
-    /* Identification */
+    /*
+     * Metadata
+     */
 
+    /**
+     * @returns A unique identifier for the Setting's internal data type.
+     */
     [[nodiscard]] virtual std::type_index TypeId() const = 0;
+
+    /**
+     * Returns true if the Setting's internal data type is an enum.
+     *
+     * @returns True if the Setting's internal data type is an enum
+     */
     [[nodiscard]] virtual constexpr bool IsEnum() const = 0;
+
     /**
-     * Returns whether the current setting is Switchable.
+     * Returns true if the current setting is Switchable.
      *
      * @returns If the setting is a SwitchableSetting
      */
     [[nodiscard]] virtual constexpr bool Switchable() const {
         return false;
     }
+
     /**
-     * Returns the save preference of the setting i.e. when saving or reading the setting from a
-     * frontend, whether this setting should be skipped.
+     * Returns true to suggest that a frontend can read or write the setting to a configuration
+     * file.
      *
      * @returns The save preference
      */
     [[nodiscard]] bool Save() const;
+
+    /**
+     * @returns true if the current setting can be changed while the guest is running.
+     */
     [[nodiscard]] bool RuntimeModfiable() const;
+
+    /**
+     * @returns A unique number corresponding to the setting.
+     */
     [[nodiscard]] constexpr u32 Id() const {
         return id;
     }
+
     /**
      * Returns the setting's category AKA INI group.
      *
      * @returns The setting's category
      */
     [[nodiscard]] Category Category() const;
+
     /**
      * Returns the label this setting was created with.
      *
@@ -111,17 +187,38 @@ public:
      */
     [[nodiscard]] const std::string& GetLabel() const;
 
-    /* Switchable settings */
+    /**
+     * @returns If the Setting checks input values for valid ranges.
+     */
+    [[nodiscard]] virtual constexpr bool Ranged() const = 0;
+
+    /*
+     * Switchable settings
+     */
 
+    /**
+     * Sets a setting's global state. True means use the normal setting, false to use a custom
+     * value. Has no effect if the Setting is not Switchable.
+     *
+     * @param global The desired state
+     */
     virtual void SetGlobal(bool global);
+
+    /**
+     * Returns true if the setting is using the normal setting value. Always true if the setting is
+     * not Switchable.
+     *
+     * @returns The Setting's global state
+     */
     [[nodiscard]] virtual bool UsingGlobal() const;
 
 private:
     const std::string label;      ///< The setting's label
     const enum Category category; ///< The setting's category AKA INI group
-    const u32 id;
-    const bool save;
-    const bool runtime_modifiable;
+    const u32 id;                 ///< Unique integer for the setting
+    const bool save; ///< Suggests if the setting should be saved and read to a frontend config
+    const bool
+        runtime_modifiable; ///< Suggests if the setting can be modified while a guest is running
 };
 
 } // namespace Settings
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 1ca3acf18..658b6328d 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -198,6 +198,10 @@ public:
         return this->ToString(maximum);
     }
 
+    constexpr bool Ranged() const override {
+        return ranged;
+    }
+
 protected:
     Type value{};               ///< The setting
     const Type default_value{}; ///< The default value
-- 
cgit v1.2.3


From a0883526d6a104404404ead384788adb767c88d5 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 13 Jun 2023 19:45:51 -0400
Subject: settings: Delete cpu_accuracy_first_time

Almost a 2 year old migration setting now
---
 src/common/settings.h                         | 2 --
 src/yuzu/configuration/config.cpp             | 5 -----
 src/yuzu/configuration/shared_translation.cpp | 1 -
 3 files changed, 8 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index afda3ccaf..e510036b4 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -146,8 +146,6 @@ struct Values {
     SwitchableSetting<CpuAccuracy, true> cpu_accuracy{linkage,           CpuAccuracy::Auto,
                                                       CpuAccuracy::Auto, CpuAccuracy::Paranoid,
                                                       "cpu_accuracy",    Category::Cpu};
-    // TODO: remove cpu_accuracy_first_time, migration setting added 8 July 2021
-    Setting<bool> cpu_accuracy_first_time{linkage, true, "cpu_accuracy_first_time", Category::Cpu};
     Setting<bool> cpu_debug_mode{linkage, false, "cpu_debug_mode", Category::CpuDebug};
 
     Setting<bool> cpuopt_page_tables{linkage, true, "cpuopt_page_tables", Category::CpuDebug};
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index ba1847976..ffd4c623d 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -635,11 +635,6 @@ void Config::ReadCpuValues() {
     ReadCategory(Settings::Category::CpuDebug);
     ReadCategory(Settings::Category::CpuUnsafe);
 
-    if (Settings::values.cpu_accuracy_first_time) {
-        Settings::values.cpu_accuracy.SetValue(Settings::values.cpu_accuracy.GetDefault());
-        Settings::values.cpu_accuracy_first_time.SetValue(false);
-    }
-
     qt_config->endGroup();
 }
 
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index b5a3fba4d..fa9683b21 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -39,7 +39,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
 
     // Cpu
     INSERT(Settings, cpu_accuracy, "Accuracy:", "");
-    INSERT(Settings, cpu_accuracy_first_time, "", "");
 
     // Cpu Debug
 
-- 
cgit v1.2.3


From ee32b177823b9b8499c9fd188a571884f00cf655 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 18 Jun 2023 03:52:41 -0400
Subject: common,yuzu-qt: GCC warning silences

Fixes -Wshadow, -Wdeprecated, and catch by copy rather than by ref.
---
 src/common/settings_common.h                       |  2 +-
 src/common/settings_setting.h                      | 14 ++++++-----
 src/yuzu/configuration/configure_audio.cpp         |  4 ++--
 src/yuzu/configuration/configure_cpu.cpp           |  4 ++--
 src/yuzu/configuration/configure_general.cpp       |  4 ++--
 src/yuzu/configuration/configure_graphics.cpp      |  6 ++---
 .../configuration/configure_graphics_advanced.cpp  |  4 ++--
 src/yuzu/configuration/configure_system.cpp        |  6 ++---
 src/yuzu/configuration/shared_widget.cpp           | 27 +++++++++++-----------
 9 files changed, 37 insertions(+), 34 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 4d6d3021e..2b5c72f41 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -178,7 +178,7 @@ public:
      *
      * @returns The setting's category
      */
-    [[nodiscard]] Category Category() const;
+    [[nodiscard]] enum Category Category() const;
 
     /**
      * Returns the label this setting was created with.
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 658b6328d..f803e4e6e 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -5,6 +5,7 @@
 
 #include <map>
 #include <optional>
+#include <stdexcept>
 #include <string>
 #include <typeindex>
 #include <typeinfo>
@@ -169,7 +170,7 @@ public:
             } else {
                 this->SetValue(static_cast<Type>(std::stoll(input)));
             }
-        } catch (std::invalid_argument) {
+        } catch (std::invalid_argument& e) {
             this->SetValue(this->GetDefault());
         }
     }
@@ -229,9 +230,10 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
-                               Category category, bool save = true, bool runtime_modifiable = false)
+                               Category category_, bool save_ = true,
+                               bool runtime_modifiable_ = false)
         requires(!ranged)
-        : Setting<Type, false>{linkage, default_val, name, category, save, runtime_modifiable} {
+        : Setting<Type, false>{linkage, default_val, name, category_, save_, runtime_modifiable_} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
     virtual ~SwitchableSetting() = default;
@@ -247,11 +249,11 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
-                               const Type& max_val, const std::string& name, Category category,
-                               bool save = true, bool runtime_modifiable = false)
+                               const Type& max_val, const std::string& name, Category category_,
+                               bool save_ = true, bool runtime_modifiable_ = false)
         requires(ranged)
         : Setting<Type, true>{linkage, default_val, min_val, max_val,
-                              name,    category,    save,    runtime_modifiable} {
+                              name,    category_,   save_,   runtime_modifiable_} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
 
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index c90316725..8c5378925 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -18,10 +18,10 @@
 
 ConfigureAudio::ConfigureAudio(
     const Core::System& system_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
     const ConfigurationShared::TranslationMap& translations_,
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations_, QWidget* parent)
-    : Tab(group, parent), ui(std::make_unique<Ui::ConfigureAudio>()), system{system_},
+    : Tab(group_, parent), ui(std::make_unique<Ui::ConfigureAudio>()), system{system_},
       translations{translations_}, combobox_translations{combobox_translations_} {
     ui->setupUi(this);
     Setup();
diff --git a/src/yuzu/configuration/configure_cpu.cpp b/src/yuzu/configuration/configure_cpu.cpp
index f4bec1155..210af146d 100644
--- a/src/yuzu/configuration/configure_cpu.cpp
+++ b/src/yuzu/configuration/configure_cpu.cpp
@@ -15,10 +15,10 @@
 
 ConfigureCpu::ConfigureCpu(
     const Core::System& system_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
     const ConfigurationShared::TranslationMap& translations_,
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations_, QWidget* parent)
-    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureCpu>()}, system{system_},
+    : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureCpu>()}, system{system_},
       translations{translations_}, combobox_translations{combobox_translations_} {
     ui->setupUi(this);
 
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 625dd75dd..ca5b92bc0 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -14,10 +14,10 @@
 
 ConfigureGeneral::ConfigureGeneral(
     const Core::System& system_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
     const ConfigurationShared::TranslationMap& translations_,
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations_, QWidget* parent)
-    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureGeneral>()}, system{system_},
+    : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureGeneral>()}, system{system_},
       translations{translations_}, combobox_translations{combobox_translations_} {
     ui->setupUi(this);
 
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 62d74d12b..5537118ef 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -80,10 +80,10 @@ static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode)
 ConfigureGraphics::ConfigureGraphics(
     const Core::System& system_, std::vector<VkDeviceInfo::Record>& records_,
     const std::function<void()>& expose_compute_option_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
     const ConfigurationShared::TranslationMap& translations_,
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations_, QWidget* parent)
-    : ConfigurationShared::Tab(group, parent), ui{std::make_unique<Ui::ConfigureGraphics>()},
+    : ConfigurationShared::Tab(group_, parent), ui{std::make_unique<Ui::ConfigureGraphics>()},
       records{records_}, expose_compute_option{expose_compute_option_}, system{system_},
       translations{translations_}, combobox_translations{combobox_translations_},
       shader_mapping{combobox_translations.at(typeid(Settings::ShaderBackend))} {
@@ -275,7 +275,7 @@ void ConfigureGraphics::Setup() {
 
             if (!Settings::IsConfiguringGlobal()) {
                 QObject::connect(api_restore_global_button, &QAbstractButton::clicked,
-                                 [=](bool) { UpdateAPILayout(); });
+                                 [this](bool) { UpdateAPILayout(); });
 
                 // Detach API's restore button and place it where we want
                 // Lets us put it on the side, and it will automatically scale if there's a
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 20ca3fa96..e2f7d284d 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -13,10 +13,10 @@
 
 ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(
     const Core::System& system_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
     const ConfigurationShared::TranslationMap& translations_,
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations_, QWidget* parent)
-    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureGraphicsAdvanced>()}, system{system_},
+    : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureGraphicsAdvanced>()}, system{system_},
       translations{translations_}, combobox_translations{combobox_translations_} {
 
     ui->setupUi(this);
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index f78ed7c24..51b0629a6 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -45,10 +45,10 @@ static bool IsValidLocale(u32 region_index, u32 language_index) {
 }
 
 ConfigureSystem::ConfigureSystem(
-    Core::System& system_, std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+    Core::System& system_, std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
     const ConfigurationShared::TranslationMap& translations_,
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations_, QWidget* parent)
-    : Tab(group, parent), ui{std::make_unique<Ui::ConfigureSystem>()}, system{system_},
+    : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureSystem>()}, system{system_},
       translations{translations_}, combobox_translations{combobox_translations_} {
     ui->setupUi(this);
 
@@ -128,7 +128,7 @@ void ConfigureSystem::Setup() {
         }
 
         [[maybe_unused]] std::string label = setting->GetLabel();
-        ConfigurationShared::Widget* widget = [=]() {
+        ConfigurationShared::Widget* widget = [this, setting, runtime_lock]() {
             if (setting->Id() == Settings::values.custom_rtc.Id()) {
                 // custom_rtc needs a DateTimeEdit (default is LineEdit), and a checkbox to manage
                 // it and custom_rtc_enabled
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index a855559b6..882cd9eda 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -276,7 +276,7 @@ QWidget* Widget::CreateHexEdit(std::function<std::string()>& serializer,
     line_edit->setMaxLength(8);
     line_edit->setValidator(regex);
 
-    auto hex_to_dec = [=]() -> std::string {
+    auto hex_to_dec = [this]() -> std::string {
         return std::to_string(std::stoul(line_edit->text().toStdString(), nullptr, 16));
     };
 
@@ -307,8 +307,8 @@ QWidget* Widget::CreateDateTimeEdit(bool disabled, bool restrict,
     serializer = [this]() { return std::to_string(date_time_edit->dateTime().toSecsSinceEpoch()); };
 
     if (!Settings::IsConfiguringGlobal()) {
-        auto get_clear_val = [=]() {
-            return QDateTime::fromSecsSinceEpoch([=]() {
+        auto get_clear_val = [this, restrict, current_time]() {
+            return QDateTime::fromSecsSinceEpoch([this, restrict, current_time]() {
                 if (restrict && checkbox->checkState() == Qt::Checked) {
                     return std::stoll(setting.ToStringGlobal());
                 }
@@ -316,13 +316,14 @@ QWidget* Widget::CreateDateTimeEdit(bool disabled, bool restrict,
             }());
         };
 
-        restore_func = [=]() { date_time_edit->setDateTime(get_clear_val()); };
+        restore_func = [this, get_clear_val]() { date_time_edit->setDateTime(get_clear_val()); };
 
-        QObject::connect(date_time_edit, &QDateTimeEdit::editingFinished, [=]() {
-            if (date_time_edit->dateTime() != get_clear_val()) {
-                touch();
-            }
-        });
+        QObject::connect(date_time_edit, &QDateTimeEdit::editingFinished,
+                         [this, get_clear_val, touch]() {
+                             if (date_time_edit->dateTime() != get_clear_val()) {
+                                 touch();
+                             }
+                         });
     }
 
     return date_time_edit;
@@ -528,11 +529,11 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
     this->setToolTip(tooltip);
 }
 
-Widget::Widget(Settings::BasicSetting* setting, const TranslationMap& translations,
-               const ComboboxTranslationMap& combobox_translations, QWidget* parent,
-               bool runtime_lock, std::forward_list<std::function<void(bool)>>& apply_funcs_,
+Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translations_,
+               const ComboboxTranslationMap& combobox_translations, QWidget* parent_,
+               bool runtime_lock_, std::forward_list<std::function<void(bool)>>& apply_funcs_,
                Settings::BasicSetting* other_setting, RequestType request, const QString& string)
-    : Widget(setting, translations, combobox_translations, parent, runtime_lock, apply_funcs_,
+    : Widget(setting_, translations_, combobox_translations, parent_, runtime_lock_, apply_funcs_,
              request, true, 1.0f, other_setting, string) {}
 
 } // namespace ConfigurationShared
-- 
cgit v1.2.3


From c97cbd089b371ed07234c66633f105862462826a Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 18 Jun 2023 17:58:07 -0400
Subject: settings_setting: Fix MSVC error

---
 src/common/settings_setting.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index f803e4e6e..a0a05da54 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -170,7 +170,7 @@ public:
             } else {
                 this->SetValue(static_cast<Type>(std::stoll(input)));
             }
-        } catch (std::invalid_argument& e) {
+        } catch (std::invalid_argument&) {
             this->SetValue(this->GetDefault());
         }
     }
-- 
cgit v1.2.3


From 3f0cc544cf7184adacec22aedd81f6d796bbea31 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 18 Jun 2023 19:57:14 -0400
Subject: common,yuzu-qt: Avoid explicit instantiation on old clang

Clang versions < 15 have compile issues with explicit instantiation.
Disable it for these versions.
---
 src/common/CMakeLists.txt | 11 ++++++++---
 src/common/settings.cpp   |  2 ++
 src/common/settings.h     |  2 ++
 src/yuzu/CMakeLists.txt   |  6 ++++++
 src/yuzu/uisettings.cpp   |  2 ++
 src/yuzu/uisettings.h     |  2 ++
 6 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'src/common')

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 09e7e673e..cf05ae364 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -197,10 +197,15 @@ if (MSVC)
     /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
     /we4800 # Implicit conversion from 'type' to bool. Possible information loss
   )
-else()
+endif()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   target_compile_options(common PRIVATE
-    $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
-    $<$<CXX_COMPILER_ID:Clang>:-Werror=unreachable-code-aggressive>
+    -fsized-deallocation
+    -Werror=unreachable-code-aggressive
+  )
+  target_compile_definitions(common PRIVATE
+    $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>
   )
 endif()
 
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index a1cc76a38..f4eb2d2fb 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -25,6 +25,7 @@
 
 namespace Settings {
 
+#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
 #define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>
 #define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>
 
@@ -61,6 +62,7 @@ SWITCHABLE(u8, true);
 
 #undef SETTING
 #undef SWITCHABLE
+#endif
 
 Values values;
 
diff --git a/src/common/settings.h b/src/common/settings.h
index e510036b4..35fa4cf3d 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -45,6 +45,7 @@ struct ResolutionScalingInfo {
     }
 };
 
+#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
 // Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work
 #define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED>
 #define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED>
@@ -84,6 +85,7 @@ SWITCHABLE(u8, true);
 
 #undef SETTING
 #undef SWITCHABLE
+#endif
 
 /**
  * The InputSetting class allows for getting a reference to either the global or custom members.
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 899b75871..5183aabdf 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -235,6 +235,12 @@ if (WIN32 AND YUZU_CRASH_DUMPS)
     target_compile_definitions(yuzu PRIVATE -DYUZU_DBGHELP)
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    target_compile_definitions(yuzu PRIVATE
+        $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>
+    )
+endif()
+
 file(GLOB COMPAT_LIST
      ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
      ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 2a02a27bc..41e2493b3 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -3,6 +3,7 @@
 
 #include "yuzu/uisettings.h"
 
+#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
 namespace Settings {
 template class Setting<bool>;
 template class Setting<std::string>;
@@ -12,6 +13,7 @@ template class Setting<u8, true>;
 template class Setting<u8>;
 template class Setting<unsigned long long>;
 } // namespace Settings
+#endif
 
 namespace UISettings {
 
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 2152b0b3b..08049f9c4 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -17,6 +17,7 @@
 using Settings::Category;
 using Settings::Setting;
 
+#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
 namespace Settings {
 extern template class Setting<bool>;
 extern template class Setting<std::string>;
@@ -26,6 +27,7 @@ extern template class Setting<u8, true>;
 extern template class Setting<u8>;
 extern template class Setting<unsigned long long>;
 } // namespace Settings
+#endif
 
 namespace UISettings {
 
-- 
cgit v1.2.3


From 3a7705e7744305bc788b948e9893b0b504a662df Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:41:15 -0400
Subject: settings: Move speed_limit to core

---
 src/common/settings.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 35fa4cf3d..c9fe6f045 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -143,6 +143,10 @@ struct Values {
     SwitchableSetting<bool> use_multi_core{linkage, true, "use_multi_core", Category::Core};
     SwitchableSetting<bool> use_unsafe_extended_memory_layout{
         linkage, false, "use_unsafe_extended_memory_layout", Category::Core};
+    SwitchableSetting<bool> use_speed_limit{linkage,        true,  "use_speed_limit",
+                                            Category::Core, false, true};
+    SwitchableSetting<u16, true> speed_limit{linkage,        100,  0,   9999, "speed_limit",
+                                             Category::Core, true, true};
 
     // Cpu
     SwitchableSetting<CpuAccuracy, true> cpu_accuracy{linkage,           CpuAccuracy::Auto,
@@ -196,10 +200,6 @@ struct Values {
                                                   Category::Renderer};
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{
         linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
-    SwitchableSetting<bool> use_speed_limit{linkage, true, "use_speed_limit", Category::Renderer,
-                                            false,   true};
-    SwitchableSetting<u16, true> speed_limit{
-        linkage, 100, 0, 9999, "speed_limit", Category::Renderer, true, true};
     SwitchableSetting<AstcDecodeMode, true> accelerate_astc{linkage,
                                                             AstcDecodeMode::Cpu,
                                                             AstcDecodeMode::Cpu,
-- 
cgit v1.2.3


From fdbeb841682b89d4c9fb112786e716f5fac9540c Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 20 Jun 2023 19:26:12 -0400
Subject: settings,uisettings: Remove leading underscore

---
 src/common/CMakeLists.txt | 2 +-
 src/common/settings.cpp   | 2 +-
 src/common/settings.h     | 2 +-
 src/yuzu/CMakeLists.txt   | 2 +-
 src/yuzu/uisettings.cpp   | 2 +-
 src/yuzu/uisettings.h     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/common')

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index cf05ae364..e205055e6 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -205,7 +205,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     -Werror=unreachable-code-aggressive
   )
   target_compile_definitions(common PRIVATE
-    $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>
+    $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
   )
 endif()
 
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index f4eb2d2fb..d9948dde8 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -25,7 +25,7 @@
 
 namespace Settings {
 
-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
+#ifndef CANNOT_EXPLICITLY_INSTANTIATE
 #define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>
 #define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>
 
diff --git a/src/common/settings.h b/src/common/settings.h
index c9fe6f045..0ae71dd1b 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -45,7 +45,7 @@ struct ResolutionScalingInfo {
     }
 };
 
-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
+#ifndef CANNOT_EXPLICITLY_INSTANTIATE
 // Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work
 #define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED>
 #define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED>
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 5183aabdf..2e4da696c 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -237,7 +237,7 @@ endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     target_compile_definitions(yuzu PRIVATE
-        $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>
+        $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
     )
 endif()
 
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 41e2493b3..f03dc01dd 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -3,7 +3,7 @@
 
 #include "yuzu/uisettings.h"
 
-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
+#ifndef CANNOT_EXPLICITLY_INSTANTIATE
 namespace Settings {
 template class Setting<bool>;
 template class Setting<std::string>;
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 08049f9c4..ee8c9f214 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -17,7 +17,7 @@
 using Settings::Category;
 using Settings::Setting;
 
-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE
+#ifndef CANNOT_EXPLICITLY_INSTANTIATE
 namespace Settings {
 extern template class Setting<bool>;
 extern template class Setting<std::string>;
-- 
cgit v1.2.3


From 7ffbffe170326eb8e21fa96e5374ba6b68370db6 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 20 Jun 2023 23:25:39 -0400
Subject: settings_enums: More aggressively use macros

This lets us define an enum and all the textual representations
of its values in one swing. All for the price of some ugly macros.
---
 src/common/settings_enums.h | 500 +++++++++++++-------------------------------
 1 file changed, 149 insertions(+), 351 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index f3d76b927..71515257a 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -3,15 +3,72 @@
 
 #pragma once
 
-#include <map>
 #include <string>
-#include <type_traits>
-#include <typeindex>
-#include <typeinfo>
+#include <utility>
+#include <vector>
 #include "common/common_types.h"
 
 namespace Settings {
 
+template <typename T>
+struct Canonicalization {
+    static constexpr std::vector<std::pair<std::string, u32>> Get();
+};
+
+#define PAIR_45(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_46(N, __VA_ARGS__))
+#define PAIR_44(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_45(N, __VA_ARGS__))
+#define PAIR_43(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_44(N, __VA_ARGS__))
+#define PAIR_42(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_43(N, __VA_ARGS__))
+#define PAIR_41(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_42(N, __VA_ARGS__))
+#define PAIR_40(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_41(N, __VA_ARGS__))
+#define PAIR_39(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_40(N, __VA_ARGS__))
+#define PAIR_38(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_39(N, __VA_ARGS__))
+#define PAIR_37(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_38(N, __VA_ARGS__))
+#define PAIR_36(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_37(N, __VA_ARGS__))
+#define PAIR_35(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_36(N, __VA_ARGS__))
+#define PAIR_34(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_35(N, __VA_ARGS__))
+#define PAIR_33(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_34(N, __VA_ARGS__))
+#define PAIR_32(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_33(N, __VA_ARGS__))
+#define PAIR_31(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_32(N, __VA_ARGS__))
+#define PAIR_30(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_31(N, __VA_ARGS__))
+#define PAIR_29(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_30(N, __VA_ARGS__))
+#define PAIR_28(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_29(N, __VA_ARGS__))
+#define PAIR_27(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_28(N, __VA_ARGS__))
+#define PAIR_26(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_27(N, __VA_ARGS__))
+#define PAIR_25(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_26(N, __VA_ARGS__))
+#define PAIR_24(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_25(N, __VA_ARGS__))
+#define PAIR_23(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_24(N, __VA_ARGS__))
+#define PAIR_22(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_23(N, __VA_ARGS__))
+#define PAIR_21(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_22(N, __VA_ARGS__))
+#define PAIR_20(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_21(N, __VA_ARGS__))
+#define PAIR_19(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_20(N, __VA_ARGS__))
+#define PAIR_18(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_19(N, __VA_ARGS__))
+#define PAIR_17(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_18(N, __VA_ARGS__))
+#define PAIR_16(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_17(N, __VA_ARGS__))
+#define PAIR_15(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_16(N, __VA_ARGS__))
+#define PAIR_14(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_15(N, __VA_ARGS__))
+#define PAIR_13(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_14(N, __VA_ARGS__))
+#define PAIR_12(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_13(N, __VA_ARGS__))
+#define PAIR_11(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_12(N, __VA_ARGS__))
+#define PAIR_10(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_11(N, __VA_ARGS__))
+#define PAIR_9(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_10(N, __VA_ARGS__))
+#define PAIR_8(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_9(N, __VA_ARGS__))
+#define PAIR_7(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_8(N, __VA_ARGS__))
+#define PAIR_6(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_7(N, __VA_ARGS__))
+#define PAIR_5(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_6(N, __VA_ARGS__))
+#define PAIR_4(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_5(N, __VA_ARGS__))
+#define PAIR_3(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_4(N, __VA_ARGS__))
+#define PAIR_2(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_3(N, __VA_ARGS__))
+#define PAIR_1(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_2(N, __VA_ARGS__))
+#define PAIR(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_1(N, __VA_ARGS__))
+
+#define ENUM(NAME, ...)                                                                            \
+    enum class NAME : u32 { __VA_ARGS__ };                                                         \
+    template <>                                                                                    \
+    constexpr std::vector<std::pair<std::string, u32>> Canonicalization<NAME>::Get() {             \
+        return {PAIR(NAME, __VA_ARGS__)};                                                          \
+    }
+
 enum class AudioEngine : u32 {
     Auto,
     Cubeb,
@@ -19,380 +76,121 @@ enum class AudioEngine : u32 {
     Null,
 };
 
-enum class AudioMode : u32 {
-    Mono,
-    Stereo,
-    Surround,
-};
+template <>
+constexpr std::vector<std::pair<std::string, u32>> Canonicalization<AudioEngine>::Get() {
+    return {
+        {"auto", static_cast<u32>(AudioEngine::Auto)},
+        {"cubeb", static_cast<u32>(AudioEngine::Cubeb)},
+        {"sdl2", static_cast<u32>(AudioEngine::Sdl2)},
+        {"null", static_cast<u32>(AudioEngine::Null)},
+    };
+}
 
-enum class Language : u32 {
-    Japanese,
-    EnglishAmerican,
-    French,
-    German,
-    Italian,
-    Spanish,
-    Chinese,
-    Korean,
-    Dutch,
-    Portuguese,
-    Russian,
-    Taiwanese,
-    EnglishBritish,
-    FrenchCanadian,
-    SpanishLatin,
-    ChineseSimplified,
-    ChineseTraditional,
-    PortugueseBrazilian,
-};
+ENUM(AudioMode, Mono, Stereo, Surround);
 
-enum class Region : u32 {
-    Japan,
-    Usa,
-    Europe,
-    Australia,
-    China,
-    Korea,
-    Taiwan,
-};
+ENUM(Language, Japanese, EnglishAmerican, French, German, Italian, Spanish, Chinese, Korean, Dutch,
+     Portuguese, Russian, Taiwanese, EnglishBritish, FrenchCanadian, SpanishLatin,
+     ChineseSimplified, ChineseTraditional, PortugueseBrazilian);
 
-enum class TimeZone : u32 {
-    Auto,
-    Default,
-    CET,
-    CST6CDT,
-    Cuba,
-    EET,
-    Egypt,
-    Eire,
-    EST,
-    EST5EDT,
-    GB,
-    GBEire,
-    GMT,
-    GMTPlusZero,
-    GMTMinusZero,
-    GMTZero,
-    Greenwich,
-    Hongkong,
-    HST,
-    Iceland,
-    Iran,
-    Israel,
-    Jamaica,
-    Japan,
-    Kwajalein,
-    Libya,
-    MET,
-    MST,
-    MST7MDT,
-    Navajo,
-    NZ,
-    NZCHAT,
-    Poland,
-    Portugal,
-    PRC,
-    PST8PDT,
-    ROC,
-    ROK,
-    Singapore,
-    Turkey,
-    UCT,
-    Universal,
-    UTC,
-    W_SU,
-    WET,
-    Zulu,
-};
+ENUM(Region, Japan, Usa, Europe, Australia, China, Korea, Taiwan);
 
-enum class AnisotropyMode : u32 {
-    Automatic = 0,
-    Default = 1,
-    X2 = 2,
-    X4 = 3,
-    X8 = 4,
-    X16 = 5,
-};
+ENUM(TimeZone, Auto, Default, CET, CST6CDT, Cuba, EET, Egypt, Eire, EST, EST5EDT, GB, GBEire, GMT,
+     GMTPlusZero, GMTMinusZero, GMTZero, Greenwich, Hongkong, HST, Iceland, Iran, Israel, Jamaica,
+     Japan, Kwajalein, Libya, MET, MST, MST7MDT, Navajo, NZ, NZCHAT, Poland, Portugal, PRC, PST8PDT,
+     ROC, ROK, Singapore, Turkey, UCT, Universal, UTC, W_SU, WET, Zulu);
 
-enum class AstcDecodeMode : u32 {
-    Cpu = 0,
-    Gpu = 1,
-    CpuAsynchronous = 2,
-};
+ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16);
 
-enum class AstcRecompression : u32 {
-    Uncompressed = 0,
-    Bc1 = 1,
-    Bc3 = 2,
-};
+ENUM(AstcDecodeMode, Cpu, Gpu, CpuAsynchronous);
 
-enum class VSyncMode : u32 {
-    Immediate = 0,
-    Mailbox = 1,
-    Fifo = 2,
-    FifoRelaxed = 3,
-};
+ENUM(AstcRecompression, Uncompressed, Bc1, Bc3);
 
-enum class RendererBackend : u32 {
-    OpenGL = 0,
-    Vulkan = 1,
-    Null = 2,
-};
+ENUM(VSyncMode, Immediate, Mailbox, Fifo, FifoRelaxed);
 
-enum class ShaderBackend : u32 {
-    Glsl = 0,
-    Glasm = 1,
-    SpirV = 2,
-};
+ENUM(RendererBackend, OpenGL, Vulkan, Null);
 
-enum class GpuAccuracy : u32 {
-    Normal = 0,
-    High = 1,
-    Extreme = 2,
-};
+ENUM(ShaderBackend, Glsl, Glasm, SpirV);
 
-enum class CpuAccuracy : u32 {
-    Auto = 0,
-    Accurate = 1,
-    Unsafe = 2,
-    Paranoid = 3,
-};
-
-enum class FullscreenMode : u32 {
-    Borderless = 0,
-    Exclusive = 1,
-};
-
-enum class NvdecEmulation : u32 {
-    Off = 0,
-    Cpu = 1,
-    Gpu = 2,
-};
-
-enum class ResolutionSetup : u32 {
-    Res1_2X = 0,
-    Res3_4X = 1,
-    Res1X = 2,
-    Res3_2X = 3,
-    Res2X = 4,
-    Res3X = 5,
-    Res4X = 6,
-    Res5X = 7,
-    Res6X = 8,
-    Res7X = 9,
-    Res8X = 10,
-};
+ENUM(GpuAccuracy, Normal, High, Extreme);
 
-enum class ScalingFilter : u32 {
-    NearestNeighbor = 0,
-    Bilinear = 1,
-    Bicubic = 2,
-    Gaussian = 3,
-    ScaleForce = 4,
-    Fsr = 5,
-    LastFilter = Fsr,
-};
+ENUM(CpuAccuracy, Auto, Accurate, Unsafe, Paranoid);
 
-enum class AntiAliasing : u32 {
-    None = 0,
-    Fxaa = 1,
-    Smaa = 2,
-    LastAA = Smaa,
-};
+ENUM(FullscreenMode, Borderless, Exclusive);
 
-enum class AspectRatio : u32 {
-    R16_9,
-    R4_3,
-    R21_9,
-    R16_10,
-    Stretch,
-};
+ENUM(NvdecEmulation, Off, Cpu, Gpu);
 
-#define X(ENUM, NAME)                                                                              \
-    { (#NAME), static_cast<u32>(ENUM::NAME) }
+ENUM(ResolutionSetup, Res1_2X, Res3_4X, Res1X, Res3_2X, Res2X, Res3X, Res4X, Res5X, Res6X, Res7X,
+     Res8X);
 
-static const std::map<std::type_index, std::map<std::string, u32>> canonicalizations = {
-    {typeid(AudioEngine),
-     {
-         {"auto", static_cast<u32>(AudioEngine::Auto)},
-         {"cubeb", static_cast<u32>(AudioEngine::Cubeb)},
-         {"sdl2", static_cast<u32>(AudioEngine::Sdl2)},
-         {"null", static_cast<u32>(AudioEngine::Null)},
-     }},
-    {typeid(AudioMode),
-     {
-         X(AudioMode, Mono),
-         X(AudioMode, Stereo),
-         X(AudioMode, Surround),
-     }},
-    {typeid(Language),
-     {
-         X(Language, Japanese),
-         X(Language, EnglishAmerican),
-         X(Language, French),
-         X(Language, German),
-         X(Language, Italian),
-         X(Language, Spanish),
-         X(Language, Chinese),
-         X(Language, Korean),
-         X(Language, Dutch),
-         X(Language, Portuguese),
-         X(Language, Russian),
-         X(Language, Taiwanese),
-         X(Language, EnglishBritish),
-         X(Language, FrenchCanadian),
-         X(Language, SpanishLatin),
-         X(Language, ChineseSimplified),
-         X(Language, ChineseTraditional),
-         X(Language, PortugueseBrazilian),
-     }},
-    {typeid(Region),
-     {
-         X(Region, Japan),
-         X(Region, Usa),
-         X(Region, Europe),
-         X(Region, Australia),
-         X(Region, China),
-         X(Region, Korea),
-         X(Region, Taiwan),
-     }},
-    {typeid(TimeZone),
-     {
-         X(TimeZone, Auto),        X(TimeZone, Default),      X(TimeZone, CET),
-         X(TimeZone, CST6CDT),     X(TimeZone, Cuba),         X(TimeZone, EET),
-         X(TimeZone, Egypt),       X(TimeZone, Eire),         X(TimeZone, EST5EDT),
-         X(TimeZone, GB),          X(TimeZone, GBEire),       X(TimeZone, GMT),
-         X(TimeZone, GMTPlusZero), X(TimeZone, GMTMinusZero), X(TimeZone, GMTZero),
-         X(TimeZone, Greenwich),   X(TimeZone, Hongkong),     X(TimeZone, HST),
-         X(TimeZone, Iceland),     X(TimeZone, Iran),         X(TimeZone, Israel),
-         X(TimeZone, Jamaica),     X(TimeZone, Japan),        X(TimeZone, Kwajalein),
-         X(TimeZone, Libya),       X(TimeZone, MET),          X(TimeZone, MST),
-         X(TimeZone, MST7MDT),     X(TimeZone, Navajo),       X(TimeZone, NZ),
-         X(TimeZone, NZCHAT),      X(TimeZone, Poland),       X(TimeZone, Portugal),
-         X(TimeZone, PRC),         X(TimeZone, ROC),          X(TimeZone, ROK),
-         X(TimeZone, Singapore),   X(TimeZone, Turkey),       X(TimeZone, UCT),
-         X(TimeZone, Universal),   X(TimeZone, UTC),          X(TimeZone, W_SU),
-         X(TimeZone, WET),         X(TimeZone, Zulu),
-     }},
-    {typeid(AnisotropyMode),
-     {
-         X(AnisotropyMode, Automatic),
-         X(AnisotropyMode, Default),
-         X(AnisotropyMode, X2),
-         X(AnisotropyMode, X4),
-         X(AnisotropyMode, X8),
-         X(AnisotropyMode, X16),
-     }},
-    {typeid(AstcDecodeMode),
-     {
-         X(AstcDecodeMode, Cpu),
-         X(AstcDecodeMode, Gpu),
-         X(AstcDecodeMode, CpuAsynchronous),
-     }},
-    {typeid(AstcRecompression),
-     {
-         X(AstcRecompression, Uncompressed),
-         X(AstcRecompression, Bc1),
-         X(AstcRecompression, Bc3),
-     }},
-    {typeid(VSyncMode),
-     {
-         X(VSyncMode, Immediate),
-         X(VSyncMode, Mailbox),
-         X(VSyncMode, Fifo),
-         X(VSyncMode, FifoRelaxed),
-     }},
-    {typeid(RendererBackend),
-     {
-         X(RendererBackend, OpenGL),
-         X(RendererBackend, Vulkan),
-         X(RendererBackend, Null),
-     }},
-    {typeid(ShaderBackend),
-     {
-         X(ShaderBackend, Glsl),
-         X(ShaderBackend, Glasm),
-         X(ShaderBackend, SpirV),
-     }},
-    {typeid(GpuAccuracy),
-     {
-         X(GpuAccuracy, Normal),
-         X(GpuAccuracy, High),
-         X(GpuAccuracy, Extreme),
-     }},
-    {typeid(CpuAccuracy),
-     {
-         X(CpuAccuracy, Auto),
-         X(CpuAccuracy, Accurate),
-         X(CpuAccuracy, Unsafe),
-         X(CpuAccuracy, Paranoid),
-     }},
-    {typeid(FullscreenMode),
-     {
-         X(FullscreenMode, Borderless),
-         X(FullscreenMode, Exclusive),
-     }},
-    {typeid(NvdecEmulation),
-     {
-         X(NvdecEmulation, Off),
-         X(NvdecEmulation, Cpu),
-         X(NvdecEmulation, Gpu),
-     }},
-    {typeid(ResolutionSetup),
-     {
-         X(ResolutionSetup, Res1_2X),
-         X(ResolutionSetup, Res3_4X),
-         X(ResolutionSetup, Res1X),
-         X(ResolutionSetup, Res3_2X),
-         X(ResolutionSetup, Res2X),
-         X(ResolutionSetup, Res3X),
-         X(ResolutionSetup, Res4X),
-         X(ResolutionSetup, Res5X),
-         X(ResolutionSetup, Res6X),
-         X(ResolutionSetup, Res7X),
-         X(ResolutionSetup, Res8X),
-     }},
-    {typeid(ScalingFilter),
-     {
-         X(ScalingFilter, NearestNeighbor),
-         X(ScalingFilter, Bilinear),
-         X(ScalingFilter, Bicubic),
-         X(ScalingFilter, Gaussian),
-         X(ScalingFilter, ScaleForce),
-         X(ScalingFilter, Fsr),
-     }},
-    {typeid(AntiAliasing),
-     {
-         X(AntiAliasing, None),
-         X(AntiAliasing, Fxaa),
-         X(AntiAliasing, Smaa),
-     }},
-    {typeid(AspectRatio),
-     {
-         X(AspectRatio, R16_9),
-         X(AspectRatio, R4_3),
-         X(AspectRatio, R21_9),
-         X(AspectRatio, R16_10),
-         X(AspectRatio, Stretch),
-     }}};
+ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, ScaleForce, Fsr, LastFilter);
 
-#undef X
+ENUM(AntiAliasing, None, Fxaa, Smaa, LastAA);
 
-static const std::string invalid_string{"(invalid setting)"};
+ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
 
 template <typename Type>
-const std::string& CanonicalizeEnum(Type id) {
-    auto& group = canonicalizations.at(typeid(Type));
+constexpr std::string CanonicalizeEnum(Type id) {
+    const auto group = Canonicalization<Type>::Get();
     for (auto& [name, value] : group) {
         if (static_cast<Type>(value) == id) {
             return name;
         }
     }
-    return invalid_string;
+    return "unknown";
 }
 
 template <typename Type>
-static Type ToEnum(const std::string& canonicalization) {
-    return static_cast<Type>(canonicalizations.at(typeid(Type)).at(canonicalization));
+constexpr Type ToEnum(const std::string& canonicalization) {
+    const auto group = Canonicalization<Type>::Get();
+    for (auto& [name, value] : group) {
+        if (name == canonicalization) {
+            return static_cast<Type>(value);
+        }
+    }
+    return {};
 }
 } // namespace Settings
+
+#undef ENUM
+#undef PAIR
+#undef PAIR_1
+#undef PAIR_2
+#undef PAIR_3
+#undef PAIR_4
+#undef PAIR_5
+#undef PAIR_6
+#undef PAIR_7
+#undef PAIR_8
+#undef PAIR_9
+#undef PAIR_10
+#undef PAIR_12
+#undef PAIR_13
+#undef PAIR_14
+#undef PAIR_15
+#undef PAIR_16
+#undef PAIR_17
+#undef PAIR_18
+#undef PAIR_19
+#undef PAIR_20
+#undef PAIR_22
+#undef PAIR_23
+#undef PAIR_24
+#undef PAIR_25
+#undef PAIR_26
+#undef PAIR_27
+#undef PAIR_28
+#undef PAIR_29
+#undef PAIR_30
+#undef PAIR_32
+#undef PAIR_33
+#undef PAIR_34
+#undef PAIR_35
+#undef PAIR_36
+#undef PAIR_37
+#undef PAIR_38
+#undef PAIR_39
+#undef PAIR_40
+#undef PAIR_42
+#undef PAIR_43
+#undef PAIR_44
+#undef PAIR_45
-- 
cgit v1.2.3


From 8366736b67d6febe278b6599badf4e945599bc30 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 20 Jun 2023 23:29:07 -0400
Subject: settings,opengl,yuzu-qt: Fix AA, Filter maximums

The new enum macros don't support setting values directly.
For LastAA and LastFilter, this means we need a simpler approach to loop
around the toggle in the frontend...
---
 src/common/settings_enums.h                        |  4 ++--
 src/video_core/renderer_opengl/renderer_opengl.cpp |  2 +-
 src/yuzu/main.cpp                                  | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index 71515257a..cc5c929cf 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -122,9 +122,9 @@ ENUM(NvdecEmulation, Off, Cpu, Gpu);
 ENUM(ResolutionSetup, Res1_2X, Res3_4X, Res1X, Res3_2X, Res2X, Res3X, Res4X, Res5X, Res6X, Res7X,
      Res8X);
 
-ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, ScaleForce, Fsr, LastFilter);
+ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, ScaleForce, Fsr, MaxEnum);
 
-ENUM(AntiAliasing, None, Fxaa, Smaa, LastAA);
+ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);
 
 ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
 
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 2a74c1d05..6b8d4e554 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -473,7 +473,7 @@ void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) {
     glBindTextureUnit(0, screen_info.display_texture);
 
     auto anti_aliasing = Settings::values.anti_aliasing.GetValue();
-    if (anti_aliasing > Settings::AntiAliasing::LastAA) {
+    if (anti_aliasing >= Settings::AntiAliasing::MaxEnum) {
         LOG_ERROR(Render_OpenGL, "Invalid antialiasing option selected {}", anti_aliasing);
         anti_aliasing = Settings::AntiAliasing::None;
         Settings::values.anti_aliasing.SetValue(anti_aliasing);
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 2922b3347..97ae9e49a 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -24,6 +24,7 @@
 #include "applets/qt_software_keyboard.h"
 #include "applets/qt_web_browser.h"
 #include "common/nvidia_flags.h"
+#include "common/settings_enums.h"
 #include "configuration/configure_input.h"
 #include "configuration/configure_per_game.h"
 #include "configuration/configure_tas.h"
@@ -1095,10 +1096,9 @@ void GMainWindow::InitializeWidgets() {
     aa_status_button->setFocusPolicy(Qt::NoFocus);
     connect(aa_status_button, &QPushButton::clicked, [&] {
         auto aa_mode = Settings::values.anti_aliasing.GetValue();
-        if (aa_mode == Settings::AntiAliasing::LastAA) {
+        aa_mode = static_cast<Settings::AntiAliasing>(static_cast<u32>(aa_mode) + 1);
+        if (aa_mode == Settings::AntiAliasing::MaxEnum) {
             aa_mode = Settings::AntiAliasing::None;
-        } else {
-            aa_mode = static_cast<Settings::AntiAliasing>(static_cast<u32>(aa_mode) + 1);
         }
         Settings::values.anti_aliasing.SetValue(aa_mode);
         aa_status_button->setChecked(true);
@@ -3702,10 +3702,9 @@ void GMainWindow::OnIncreaseVolume() {
 
 void GMainWindow::OnToggleAdaptingFilter() {
     auto filter = Settings::values.scaling_filter.GetValue();
-    if (filter == Settings::ScalingFilter::LastFilter) {
+    filter = static_cast<Settings::ScalingFilter>(static_cast<u32>(filter) + 1);
+    if (filter == Settings::ScalingFilter::MaxEnum) {
         filter = Settings::ScalingFilter::NearestNeighbor;
-    } else {
-        filter = static_cast<Settings::ScalingFilter>(static_cast<u32>(filter) + 1);
     }
     Settings::values.scaling_filter.SetValue(filter);
     filter_status_button->setChecked(true);
-- 
cgit v1.2.3


From 8b28aa45b99cc6f6c9399bbe421460de67088cff Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 20 Jun 2023 23:34:03 -0400
Subject: settings,translation: Fix time zone enum

Renames enum values to conform to naming convention.
---
 src/common/settings_enums.h                   |  8 ++---
 src/yuzu/configuration/shared_translation.cpp | 48 +++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index cc5c929cf..c380e409e 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -94,10 +94,10 @@ ENUM(Language, Japanese, EnglishAmerican, French, German, Italian, Spanish, Chin
 
 ENUM(Region, Japan, Usa, Europe, Australia, China, Korea, Taiwan);
 
-ENUM(TimeZone, Auto, Default, CET, CST6CDT, Cuba, EET, Egypt, Eire, EST, EST5EDT, GB, GBEire, GMT,
-     GMTPlusZero, GMTMinusZero, GMTZero, Greenwich, Hongkong, HST, Iceland, Iran, Israel, Jamaica,
-     Japan, Kwajalein, Libya, MET, MST, MST7MDT, Navajo, NZ, NZCHAT, Poland, Portugal, PRC, PST8PDT,
-     ROC, ROK, Singapore, Turkey, UCT, Universal, UTC, W_SU, WET, Zulu);
+ENUM(TimeZone, Auto, Default, Cet, Cst6Cdt, Cuba, Eet, Egypt, Eire, Est, Est5Edt, Gb, GbEire, Gmt,
+     GmtPlusZero, GmtMinusZero, GmtZero, Greenwich, Hongkong, Hst, Iceland, Iran, Israel, Jamaica,
+     Japan, Kwajalein, Libya, Met, Mst, Mst7Mdt, Navajo, Nz, NzChat, Poland, Portugal, Prc, Pst8Pdt,
+     Roc, Rok, Singapore, Turkey, Uct, Universal, Utc, WSu, Wet, Zulu);
 
 ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16);
 
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index ec4bddb26..a75574530 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -311,46 +311,46 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
                           {
                               PAIR(TimeZone, Auto, "Auto"),
                               PAIR(TimeZone, Default, "Default"),
-                              PAIR(TimeZone, CET, "CET"),
-                              PAIR(TimeZone, CST6CDT, "CST6CDT"),
+                              PAIR(TimeZone, Cet, "CET"),
+                              PAIR(TimeZone, Cst6Cdt, "CST6CDT"),
                               PAIR(TimeZone, Cuba, "Cuba"),
-                              PAIR(TimeZone, EET, "EET"),
+                              PAIR(TimeZone, Eet, "EET"),
                               PAIR(TimeZone, Egypt, "Egypt"),
                               PAIR(TimeZone, Eire, "Eire"),
-                              PAIR(TimeZone, EST, "EST"),
-                              PAIR(TimeZone, EST5EDT, "EST5EDT"),
-                              PAIR(TimeZone, GB, "GB"),
-                              PAIR(TimeZone, GBEire, "GB-Eire"),
-                              PAIR(TimeZone, GMT, "GMT"),
-                              PAIR(TimeZone, GMTPlusZero, "GMT+0"),
-                              PAIR(TimeZone, GMTMinusZero, "GMT-0"),
-                              PAIR(TimeZone, GMTZero, "GMT0"),
+                              PAIR(TimeZone, Est, "EST"),
+                              PAIR(TimeZone, Est5Edt, "EST5EDT"),
+                              PAIR(TimeZone, Gb, "GB"),
+                              PAIR(TimeZone, GbEire, "GB-Eire"),
+                              PAIR(TimeZone, Gmt, "GMT"),
+                              PAIR(TimeZone, GmtPlusZero, "GMT+0"),
+                              PAIR(TimeZone, GmtMinusZero, "GMT-0"),
+                              PAIR(TimeZone, GmtZero, "GMT0"),
                               PAIR(TimeZone, Greenwich, "Greenwich"),
                               PAIR(TimeZone, Hongkong, "Hongkong"),
-                              PAIR(TimeZone, HST, "HST"),
+                              PAIR(TimeZone, Hst, "HST"),
                               PAIR(TimeZone, Iceland, "Iceland"),
                               PAIR(TimeZone, Iran, "Iran"),
                               PAIR(TimeZone, Israel, "Israel"),
                               PAIR(TimeZone, Jamaica, "Jamaica"),
                               PAIR(TimeZone, Kwajalein, "Kwajalein"),
                               PAIR(TimeZone, Libya, "Libya"),
-                              PAIR(TimeZone, MET, "MET"),
-                              PAIR(TimeZone, MST, "MST"),
-                              PAIR(TimeZone, MST7MDT, "MST7MDT"),
+                              PAIR(TimeZone, Met, "MET"),
+                              PAIR(TimeZone, Mst, "MST"),
+                              PAIR(TimeZone, Mst7Mdt, "MST7MDT"),
                               PAIR(TimeZone, Navajo, "Navajo"),
-                              PAIR(TimeZone, NZ, "NZ"),
-                              PAIR(TimeZone, NZCHAT, "NZ-CHAT"),
+                              PAIR(TimeZone, Nz, "NZ"),
+                              PAIR(TimeZone, NzChat, "NZ-CHAT"),
                               PAIR(TimeZone, Poland, "Poland"),
                               PAIR(TimeZone, Portugal, "Portugal"),
-                              PAIR(TimeZone, PRC, "PRC"),
-                              PAIR(TimeZone, PST8PDT, "PST8PDT"),
-                              PAIR(TimeZone, ROC, "ROC"),
-                              PAIR(TimeZone, ROK, "ROK"),
+                              PAIR(TimeZone, Prc, "PRC"),
+                              PAIR(TimeZone, Pst8Pdt, "PST8PDT"),
+                              PAIR(TimeZone, Roc, "ROC"),
+                              PAIR(TimeZone, Rok, "ROK"),
                               PAIR(TimeZone, Singapore, "Singapore"),
                               PAIR(TimeZone, Turkey, "Turkey"),
-                              PAIR(TimeZone, UCT, "UCT"),
-                              PAIR(TimeZone, W_SU, "W-SU"),
-                              PAIR(TimeZone, WET, "WET"),
+                              PAIR(TimeZone, Uct, "UCT"),
+                              PAIR(TimeZone, WSu, "W-SU"),
+                              PAIR(TimeZone, Wet, "WET"),
                               PAIR(TimeZone, Zulu, "Zulu"),
                           }});
     translations->insert({typeid(Settings::AudioMode),
-- 
cgit v1.2.3


From b2438f1fb7d083ffe8c8afdc30e9c612631d6ace Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 21 Jun 2023 03:23:36 -0400
Subject: settings: Define specializations for settings

Suggests to a frontend how to represent each setting.
---
 src/common/settings.h          | 136 ++++++++++++++++++++++++++---------------
 src/common/settings_common.cpp |  11 +++-
 src/common/settings_common.h   |  20 +++++-
 src/common/settings_setting.h  |  27 +++++---
 4 files changed, 130 insertions(+), 64 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 0ae71dd1b..c78dd85c8 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -128,25 +128,31 @@ struct Values {
     Linkage linkage{};
 
     // 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_input_device_id{linkage, "auto", "input_device", Category::Audio};
+    Setting<AudioEngine> sink_id{linkage, AudioEngine::Auto, "output_engine", Category::Audio,
+                                 Specialization::RuntimeList};
+    Setting<std::string> audio_output_device_id{linkage, "auto", "output_device", Category::Audio,
+                                                Specialization::RuntimeList};
+    Setting<std::string> audio_input_device_id{linkage, "auto", "input_device", Category::Audio,
+                                               Specialization::RuntimeList};
     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};
-    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,
-                                             false};
+    SwitchableSetting<u8, true> volume{
+        linkage, 100, 0, 200, "volume", Category::Audio, Specialization::Scalar, true, true};
+    Setting<bool, false> audio_muted{
+        linkage, false, "audio_muted", Category::Audio, Specialization::Default, false};
+    Setting<bool, false> dump_audio_commands{
+        linkage, false, "dump_audio_commands", Category::Audio, Specialization::Default, false};
 
     // Core
     SwitchableSetting<bool> use_multi_core{linkage, true, "use_multi_core", Category::Core};
     SwitchableSetting<bool> use_unsafe_extended_memory_layout{
         linkage, false, "use_unsafe_extended_memory_layout", Category::Core};
-    SwitchableSetting<bool> use_speed_limit{linkage,        true,  "use_speed_limit",
-                                            Category::Core, false, true};
-    SwitchableSetting<u16, true> speed_limit{linkage,        100,  0,   9999, "speed_limit",
-                                             Category::Core, true, true};
+    SwitchableSetting<bool> use_speed_limit{
+        linkage, true, "use_speed_limit", Category::Core, Specialization::Paired, false, true};
+    SwitchableSetting<u16, true> speed_limit{
+        linkage, 100, 0, 9999, "speed_limit", Category::Core, Specialization::Countable,
+        true,    true};
 
     // Cpu
     SwitchableSetting<CpuAccuracy, true> cpu_accuracy{linkage,           CpuAccuracy::Auto,
@@ -192,9 +198,10 @@ struct Values {
         linkage,   RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null,
         "backend", Category::Renderer};
     SwitchableSetting<ShaderBackend, true> shader_backend{
-        linkage,          ShaderBackend::Glsl, ShaderBackend::Glsl, ShaderBackend::SpirV,
-        "shader_backend", Category::Renderer};
-    SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer};
+        linkage,          ShaderBackend::Glsl, ShaderBackend::Glsl,        ShaderBackend::SpirV,
+        "shader_backend", Category::Renderer,  Specialization::RuntimeList};
+    SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer,
+                                         Specialization::RuntimeList};
 
     SwitchableSetting<bool> use_disk_shader_cache{linkage, true, "use_disk_shader_cache",
                                                   Category::Renderer};
@@ -206,14 +213,10 @@ struct Values {
                                                             AstcDecodeMode::CpuAsynchronous,
                                                             "accelerate_astc",
                                                             Category::Renderer};
-    Setting<VSyncMode, true> vsync_mode{linkage,
-                                        VSyncMode::Fifo,
-                                        VSyncMode::Immediate,
-                                        VSyncMode::FifoRelaxed,
-                                        "use_vsync",
-                                        Category::Renderer,
-                                        true,
-                                        true};
+    Setting<VSyncMode, true> vsync_mode{
+        linkage,     VSyncMode::Fifo,    VSyncMode::Immediate,        VSyncMode::FifoRelaxed,
+        "use_vsync", Category::Renderer, Specialization::RuntimeList, true,
+        true};
     SwitchableSetting<NvdecEmulation> nvdec_emulation{linkage, NvdecEmulation::Gpu,
                                                       "nvdec_emulation", Category::Renderer};
     // *nix platforms may have issues with the borderless windowed fullscreen mode.
@@ -228,6 +231,7 @@ struct Values {
                                                             FullscreenMode::Exclusive,
                                                             "fullscreen_mode",
                                                             Category::Renderer,
+                                                            Specialization::Default,
                                                             true,
                                                             true};
     SwitchableSetting<AspectRatio, true> aspect_ratio{linkage,
@@ -236,22 +240,37 @@ struct Values {
                                                       AspectRatio::Stretch,
                                                       "aspect_ratio",
                                                       Category::Renderer,
+                                                      Specialization::Default,
                                                       true,
                                                       true};
 
     ResolutionScalingInfo resolution_info{};
     SwitchableSetting<ResolutionSetup> resolution_setup{linkage, ResolutionSetup::Res1X,
                                                         "resolution_setup", Category::Renderer};
-    SwitchableSetting<ScalingFilter> scaling_filter{
-        linkage, ScalingFilter::Bilinear, "scaling_filter", Category::Renderer, true, true};
-    SwitchableSetting<AntiAliasing> anti_aliasing{
-        linkage, AntiAliasing::None, "anti_aliasing", Category::Renderer, true, true};
+    SwitchableSetting<ScalingFilter> scaling_filter{linkage,
+                                                    ScalingFilter::Bilinear,
+                                                    "scaling_filter",
+                                                    Category::Renderer,
+                                                    Specialization::Default,
+                                                    true,
+                                                    true};
+    SwitchableSetting<AntiAliasing> anti_aliasing{linkage,
+                                                  AntiAliasing::None,
+                                                  "anti_aliasing",
+                                                  Category::Renderer,
+                                                  Specialization::Default,
+                                                  true,
+                                                  true};
     SwitchableSetting<int, true> fsr_sharpening_slider{
-        linkage, 25, 0, 200, "fsr_sharpening_slider", Category::Renderer, true, true};
+        linkage, 25,  0, 200, "fsr_sharpening_slider", Category::Renderer, Specialization::Scalar,
+        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<u8, false> bg_red{
+        linkage, 0, "bg_red", Category::Renderer, Specialization::Default, true, true};
+    SwitchableSetting<u8, false> bg_green{
+        linkage, 0, "bg_green", Category::Renderer, Specialization::Default, true, true};
+    SwitchableSetting<u8, false> bg_blue{
+        linkage, 0, "bg_blue", Category::Renderer, Specialization::Default, true, true};
 
     SwitchableSetting<GpuAccuracy, true> gpu_accuracy{linkage,
                                                       GpuAccuracy::High,
@@ -259,6 +278,7 @@ struct Values {
                                                       GpuAccuracy::Extreme,
                                                       "gpu_accuracy",
                                                       Category::RendererAdvanced,
+                                                      Specialization::Default,
                                                       true,
                                                       true};
     SwitchableSetting<AnisotropyMode, true> max_anisotropy{
@@ -279,9 +299,15 @@ struct Values {
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::RendererAdvanced};
     SwitchableSetting<bool> use_fast_gpu_time{
-        linkage, true, "use_fast_gpu_time", Category::RendererAdvanced, true, true};
-    SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{
-        linkage, true, "use_vulkan_driver_pipeline_cache", Category::RendererAdvanced, true, true};
+        linkage, true, "use_fast_gpu_time", Category::RendererAdvanced, Specialization::Default,
+        true,    true};
+    SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{linkage,
+                                                             true,
+                                                             "use_vulkan_driver_pipeline_cache",
+                                                             Category::RendererAdvanced,
+                                                             Specialization::Default,
+                                                             true,
+                                                             true};
     SwitchableSetting<bool> enable_compute_pipelines{linkage, false, "enable_compute_pipelines",
                                                      Category::RendererAdvanced};
     SwitchableSetting<bool> use_video_framerate{linkage, false, "use_video_framerate",
@@ -310,15 +336,18 @@ struct Values {
                                                       TimeZone::Auto,    TimeZone::Zulu,
                                                       "time_zone_index", Category::System};
     // 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};
+    SwitchableSetting<bool> custom_rtc_enabled{
+        linkage, false, "custom_rtc_enabled", Category::System, Specialization::Paired, true, true};
+    SwitchableSetting<s64> custom_rtc{
+        linkage, 0, "custom_rtc", Category::System, Specialization::Time, 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};
+    SwitchableSetting<bool> rng_seed_enabled{
+        linkage, false, "rng_seed_enabled", Category::System, Specialization::Paired, true, true};
+    SwitchableSetting<u32> rng_seed{linkage, 0,   "rng_seed", Category::System, Specialization::Hex,
+                                    true,    true};
+    Setting<std::string> device_name{
+        linkage, "yuzu", "device_name", Category::System, Specialization::Default, true, true};
 
     Setting<s32> current_user{linkage, 0, "current_user", Category::System};
 
@@ -327,12 +356,13 @@ struct Values {
     // Controls
     InputSetting<std::array<PlayerInput, 10>> players;
 
-    Setting<bool> enable_raw_input{linkage, false, "enable_raw_input", Category::Controls,
+    Setting<bool> enable_raw_input{
+        linkage, false, "enable_raw_input", Category::Controls, Specialization::Default,
 // Only read/write enable_raw_input on Windows platforms
 #ifdef _WIN32
-                                   true
+        true
 #else
-                                   false
+        false
 #endif
     };
     Setting<bool> controller_navigation{linkage, true, "controller_navigation", Category::Controls};
@@ -354,7 +384,8 @@ struct Values {
     Setting<bool> tas_enable{linkage, false, "tas_enable", Category::Controls};
     Setting<bool> tas_loop{linkage, false, "tas_loop", Category::Controls};
 
-    Setting<bool> mouse_panning{linkage, false, "mouse_panning", Category::Controls, false};
+    Setting<bool> mouse_panning{
+        linkage, false, "mouse_panning", Category::Controls, Specialization::Default, false};
     Setting<u8, true> mouse_panning_sensitivity{
         linkage, 50, 1, 100, "mouse_panning_sensitivity", Category::Controls};
     Setting<bool> mouse_enabled{linkage, false, "mouse_enabled", Category::Controls};
@@ -410,19 +441,24 @@ struct Values {
     Setting<std::string> program_args{linkage, std::string(), "program_args", Category::Debugging};
     Setting<bool> dump_exefs{linkage, false, "dump_exefs", Category::Debugging};
     Setting<bool> dump_nso{linkage, false, "dump_nso", Category::Debugging};
-    Setting<bool> dump_shaders{linkage, false, "dump_shaders", Category::DebuggingGraphics, false};
-    Setting<bool> dump_macros{linkage, false, "dump_macros", Category::DebuggingGraphics, false};
+    Setting<bool> dump_shaders{
+        linkage, false, "dump_shaders", Category::DebuggingGraphics, Specialization::Default,
+        false};
+    Setting<bool> dump_macros{
+        linkage, false, "dump_macros", Category::DebuggingGraphics, Specialization::Default, false};
     Setting<bool> enable_fs_access_log{linkage, false, "enable_fs_access_log", Category::Debugging};
-    Setting<bool> reporting_services{linkage, false, "reporting_services", Category::Debugging,
-                                     false};
+    Setting<bool> reporting_services{
+        linkage, false, "reporting_services", Category::Debugging, Specialization::Default, false};
     Setting<bool> quest_flag{linkage, false, "quest_flag", Category::Debugging};
     Setting<bool> disable_macro_jit{linkage, false, "disable_macro_jit",
                                     Category::DebuggingGraphics};
     Setting<bool> disable_macro_hle{linkage, false, "disable_macro_hle",
                                     Category::DebuggingGraphics};
-    Setting<bool> extended_logging{linkage, false, "extended_logging", Category::Debugging, false};
+    Setting<bool> extended_logging{
+        linkage, false, "extended_logging", Category::Debugging, Specialization::Default, false};
     Setting<bool> use_debug_asserts{linkage, false, "use_debug_asserts", Category::Debugging};
-    Setting<bool> use_auto_stub{linkage, false, "use_auto_stub", Category::Debugging, false};
+    Setting<bool> use_auto_stub{
+        linkage, false, "use_auto_stub", Category::Debugging, Specialization::Default, false};
     Setting<bool> enable_all_controllers{linkage, false, "enable_all_controllers",
                                          Category::Debugging};
     Setting<bool> create_crash_dumps{linkage, false, "create_crash_dumps", Category::Debugging};
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index fb42991fa..3e86c7347 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -7,9 +7,10 @@
 namespace Settings {
 
 BasicSetting::BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
-                           bool save_, bool runtime_modifiable_)
-    : label{name}, category{category_}, id{linkage.count}, save{save_}, runtime_modifiable{
-                                                                            runtime_modifiable_} {
+                           bool save_, bool runtime_modifiable_,
+                           enum Specialization specialization_)
+    : label{name}, category{category_}, id{linkage.count}, save{save_},
+      runtime_modifiable{runtime_modifiable_}, specialization{specialization_} {
     linkage.by_category[category].push_front(this);
     linkage.count++;
 }
@@ -38,6 +39,10 @@ Category BasicSetting::Category() const {
     return category;
 }
 
+Specialization BasicSetting::Specialization() const {
+    return specialization;
+}
+
 const std::string& BasicSetting::GetLabel() const {
     return label;
 }
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 2b5c72f41..664c807f1 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -43,6 +43,17 @@ enum class Category : u32 {
     MaxEnum,
 };
 
+enum class Specialization : u32 {
+    Default,
+    Time,
+    Hex,
+    List,
+    RuntimeList,
+    Scalar,
+    Countable,
+    Paired,
+};
+
 bool IsConfiguringGlobal();
 void SetConfiguringGlobal(bool is_global);
 
@@ -64,7 +75,7 @@ public:
 class BasicSetting {
 protected:
     explicit BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
-                          bool save_, bool runtime_modifiable_);
+                          bool save_, bool runtime_modifiable_, Specialization spec);
 
 public:
     virtual ~BasicSetting();
@@ -180,6 +191,11 @@ public:
      */
     [[nodiscard]] enum Category Category() const;
 
+    /**
+     * @returns Extra metadata for data representation in frontend implementations.
+     */
+    [[nodiscard]] enum Specialization Specialization() const;
+
     /**
      * Returns the label this setting was created with.
      *
@@ -219,6 +235,8 @@ private:
     const bool save; ///< Suggests if the setting should be saved and read to a frontend config
     const bool
         runtime_modifiable; ///< Suggests if the setting can be modified while a guest is running
+    const enum Specialization
+        specialization; ///< Extra data to identify representation of a setting
 };
 
 } // namespace Settings
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index a0a05da54..9805a5b5d 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -35,10 +35,12 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
-                     enum Category category_, bool save_ = true, bool runtime_modifiable_ = false)
+                     enum Category category_,
+                     enum Specialization specialization = Specialization::Default,
+                     bool save_ = true, bool runtime_modifiable_ = false)
         requires(!ranged)
-        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_), value{default_val},
-          default_value{default_val} {}
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization),
+          value{default_val}, default_value{default_val} {}
     virtual ~Setting() = default;
 
     /**
@@ -53,10 +55,11 @@ public:
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
                      const Type& max_val, const std::string& name, enum Category category_,
+                     enum Specialization specialization = Specialization::Default,
                      bool save_ = true, bool runtime_modifiable_ = false)
         requires(ranged)
-        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_), value{default_val},
-          default_value{default_val}, maximum{max_val}, minimum{min_val} {}
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization),
+          value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val} {}
 
     /**
      *  Returns a reference to the setting's value.
@@ -230,10 +233,12 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
-                               Category category_, bool save_ = true,
-                               bool runtime_modifiable_ = false)
+                               Category category_,
+                               enum Specialization specialization = Specialization::Default,
+                               bool save_ = true, bool runtime_modifiable_ = false)
         requires(!ranged)
-        : Setting<Type, false>{linkage, default_val, name, category_, save_, runtime_modifiable_} {
+        : Setting<Type, false>{linkage, default_val,        name, category_, specialization,
+                               save_,   runtime_modifiable_} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
     virtual ~SwitchableSetting() = default;
@@ -250,10 +255,12 @@ public:
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
                                const Type& max_val, const std::string& name, Category category_,
+                               enum Specialization specialization = Specialization::Default,
                                bool save_ = true, bool runtime_modifiable_ = false)
         requires(ranged)
-        : Setting<Type, true>{linkage, default_val, min_val, max_val,
-                              name,    category_,   save_,   runtime_modifiable_} {
+        : Setting<Type, true>{linkage,        default_val, min_val,
+                              max_val,        name,        category_,
+                              specialization, save_,       runtime_modifiable_} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
 
-- 
cgit v1.2.3


From 7f708e8d77fb6237407f49246622dbe1b445d536 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 21 Jun 2023 04:32:13 -0400
Subject: settings: Define paired settings

settings_common: Remove unused optional
---
 src/common/settings.h          | 21 +++++++++++++++------
 src/common/settings_common.cpp |  9 +++++++--
 src/common/settings_common.h   | 11 +++++++++--
 src/common/settings_setting.h  | 29 ++++++++++++++++++-----------
 4 files changed, 49 insertions(+), 21 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index c78dd85c8..b87301d4e 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -150,9 +150,16 @@ struct Values {
         linkage, false, "use_unsafe_extended_memory_layout", Category::Core};
     SwitchableSetting<bool> use_speed_limit{
         linkage, true, "use_speed_limit", Category::Core, Specialization::Paired, false, true};
-    SwitchableSetting<u16, true> speed_limit{
-        linkage, 100, 0, 9999, "speed_limit", Category::Core, Specialization::Countable,
-        true,    true};
+    SwitchableSetting<u16, true> speed_limit{linkage,
+                                             100,
+                                             0,
+                                             9999,
+                                             "speed_limit",
+                                             Category::Core,
+                                             Specialization::Countable,
+                                             true,
+                                             true,
+                                             &use_speed_limit};
 
     // Cpu
     SwitchableSetting<CpuAccuracy, true> cpu_accuracy{linkage,           CpuAccuracy::Auto,
@@ -339,13 +346,15 @@ struct Values {
     SwitchableSetting<bool> custom_rtc_enabled{
         linkage, false, "custom_rtc_enabled", Category::System, Specialization::Paired, true, true};
     SwitchableSetting<s64> custom_rtc{
-        linkage, 0, "custom_rtc", Category::System, Specialization::Time, true, true};
+        linkage, 0,    "custom_rtc",       Category::System, Specialization::Time,
+        true,    true, &custom_rtc_enabled};
     // 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, Specialization::Paired, true, true};
-    SwitchableSetting<u32> rng_seed{linkage, 0,   "rng_seed", Category::System, Specialization::Hex,
-                                    true,    true};
+    SwitchableSetting<u32> rng_seed{
+        linkage, 0,    "rng_seed",       Category::System, Specialization::Hex,
+        true,    true, &rng_seed_enabled};
     Setting<std::string> device_name{
         linkage, "yuzu", "device_name", Category::System, Specialization::Default, true, true};
 
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 3e86c7347..53d4548f5 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -8,9 +8,10 @@ namespace Settings {
 
 BasicSetting::BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
                            bool save_, bool runtime_modifiable_,
-                           enum Specialization specialization_)
+                           enum Specialization specialization_, BasicSetting* other_setting_)
     : label{name}, category{category_}, id{linkage.count}, save{save_},
-      runtime_modifiable{runtime_modifiable_}, specialization{specialization_} {
+      runtime_modifiable{runtime_modifiable_}, specialization{specialization_},
+      other_setting{other_setting_} {
     linkage.by_category[category].push_front(this);
     linkage.count++;
 }
@@ -43,6 +44,10 @@ Specialization BasicSetting::Specialization() const {
     return specialization;
 }
 
+BasicSetting* BasicSetting::PairedSetting() const {
+    return other_setting;
+}
+
 const std::string& BasicSetting::GetLabel() const {
     return label;
 }
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 664c807f1..ad005ca4e 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -75,7 +75,8 @@ public:
 class BasicSetting {
 protected:
     explicit BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
-                          bool save_, bool runtime_modifiable_, Specialization spec);
+                          bool save_, bool runtime_modifiable_, Specialization spec,
+                          BasicSetting* other_setting);
 
 public:
     virtual ~BasicSetting();
@@ -196,6 +197,11 @@ public:
      */
     [[nodiscard]] enum Specialization Specialization() const;
 
+    /**
+     * @returns Another BasicSetting if one is paired, or nullptr otherwise.
+     */
+    [[nodiscard]] BasicSetting* PairedSetting() const;
+
     /**
      * Returns the label this setting was created with.
      *
@@ -236,7 +242,8 @@ private:
     const bool
         runtime_modifiable; ///< Suggests if the setting can be modified while a guest is running
     const enum Specialization
-        specialization; ///< Extra data to identify representation of a setting
+        specialization;                ///< Extra data to identify representation of a setting
+    BasicSetting* const other_setting; ///< A paired setting
 };
 
 } // namespace Settings
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 9805a5b5d..dd91250a1 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -37,9 +37,11 @@ public:
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
                      enum Category category_,
                      enum Specialization specialization = Specialization::Default,
-                     bool save_ = true, bool runtime_modifiable_ = false)
+                     bool save_ = true, bool runtime_modifiable_ = false,
+                     BasicSetting* other_setting = nullptr)
         requires(!ranged)
-        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization),
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization,
+                       other_setting),
           value{default_val}, default_value{default_val} {}
     virtual ~Setting() = default;
 
@@ -56,9 +58,11 @@ public:
     explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
                      const Type& max_val, const std::string& name, enum Category category_,
                      enum Specialization specialization = Specialization::Default,
-                     bool save_ = true, bool runtime_modifiable_ = false)
+                     bool save_ = true, bool runtime_modifiable_ = false,
+                     BasicSetting* other_setting = nullptr)
         requires(ranged)
-        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization),
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization,
+                       other_setting),
           value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val} {}
 
     /**
@@ -235,10 +239,12 @@ public:
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
                                Category category_,
                                enum Specialization specialization = Specialization::Default,
-                               bool save_ = true, bool runtime_modifiable_ = false)
+                               bool save_ = true, bool runtime_modifiable_ = false,
+                               BasicSetting* other_setting = nullptr)
         requires(!ranged)
-        : Setting<Type, false>{linkage, default_val,        name, category_, specialization,
-                               save_,   runtime_modifiable_} {
+        : Setting<Type, false>{
+              linkage, default_val,         name,         category_, specialization,
+              save_,   runtime_modifiable_, other_setting} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
     virtual ~SwitchableSetting() = default;
@@ -256,11 +262,12 @@ public:
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
                                const Type& max_val, const std::string& name, Category category_,
                                enum Specialization specialization = Specialization::Default,
-                               bool save_ = true, bool runtime_modifiable_ = false)
+                               bool save_ = true, bool runtime_modifiable_ = false,
+                               BasicSetting* other_setting = nullptr)
         requires(ranged)
-        : Setting<Type, true>{linkage,        default_val, min_val,
-                              max_val,        name,        category_,
-                              specialization, save_,       runtime_modifiable_} {
+        : Setting<Type, true>{
+              linkage, default_val,         min_val,      max_val, name, category_, specialization,
+              save_,   runtime_modifiable_, other_setting} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
 
-- 
cgit v1.2.3


From 926f3e3d3e6ff57633d2d44085f02754ffe1c988 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 21 Jun 2023 05:04:21 -0400
Subject: settings,configuration: Add a default suffix

---
 src/common/settings.h                         | 26 +++++++++++----
 src/common/settings_common.cpp                |  6 ++--
 src/common/settings_common.h                  | 33 +++++++++++--------
 src/common/settings_setting.h                 | 15 ++++-----
 src/yuzu/configuration/configure_audio.cpp    | 13 ++------
 src/yuzu/configuration/configure_graphics.cpp |  4 +--
 src/yuzu/configuration/configure_system.cpp   | 11 +------
 src/yuzu/configuration/shared_widget.cpp      | 47 +++++++++++++++++++--------
 src/yuzu/configuration/shared_widget.h        | 12 +++----
 9 files changed, 93 insertions(+), 74 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index b87301d4e..c4339cb1f 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -137,8 +137,15 @@ struct Values {
     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, Specialization::Scalar, true, true};
+    SwitchableSetting<u8, true> volume{linkage,
+                                       100,
+                                       0,
+                                       200,
+                                       "volume",
+                                       Category::Audio,
+                                       Specialization::Scalar | Specialization::Percentage,
+                                       true,
+                                       true};
     Setting<bool, false> audio_muted{
         linkage, false, "audio_muted", Category::Audio, Specialization::Default, false};
     Setting<bool, false> dump_audio_commands{
@@ -156,7 +163,7 @@ struct Values {
                                              9999,
                                              "speed_limit",
                                              Category::Core,
-                                             Specialization::Countable,
+                                             Specialization::Countable | Specialization::Percentage,
                                              true,
                                              true,
                                              &use_speed_limit};
@@ -268,9 +275,16 @@ struct Values {
                                                   Specialization::Default,
                                                   true,
                                                   true};
-    SwitchableSetting<int, true> fsr_sharpening_slider{
-        linkage, 25,  0, 200, "fsr_sharpening_slider", Category::Renderer, Specialization::Scalar,
-        true,    true};
+    SwitchableSetting<int, true> fsr_sharpening_slider{linkage,
+                                                       25,
+                                                       0,
+                                                       200,
+                                                       "fsr_sharpening_slider",
+                                                       Category::Renderer,
+                                                       Specialization::Scalar |
+                                                           Specialization::Percentage,
+                                                       true,
+                                                       true};
 
     SwitchableSetting<u8, false> bg_red{
         linkage, 0, "bg_red", Category::Renderer, Specialization::Default, true, true};
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 53d4548f5..799942980 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -7,8 +7,8 @@
 namespace Settings {
 
 BasicSetting::BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
-                           bool save_, bool runtime_modifiable_,
-                           enum Specialization specialization_, BasicSetting* other_setting_)
+                           bool save_, bool runtime_modifiable_, u32 specialization_,
+                           BasicSetting* other_setting_)
     : label{name}, category{category_}, id{linkage.count}, save{save_},
       runtime_modifiable{runtime_modifiable_}, specialization{specialization_},
       other_setting{other_setting_} {
@@ -40,7 +40,7 @@ Category BasicSetting::Category() const {
     return category;
 }
 
-Specialization BasicSetting::Specialization() const {
+u32 BasicSetting::Specialization() const {
     return specialization;
 }
 
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index ad005ca4e..6b717deb1 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -43,15 +43,21 @@ enum class Category : u32 {
     MaxEnum,
 };
 
-enum class Specialization : u32 {
-    Default,
-    Time,
-    Hex,
-    List,
-    RuntimeList,
-    Scalar,
-    Countable,
-    Paired,
+constexpr u8 SpecializationTypeMask = 0xf;
+constexpr u8 SpecializationAttributeMask = 0xf0;
+constexpr u8 SpecializationAttributeOffset = 4;
+
+enum Specialization : u8 {
+    Default = 0,
+    Time = 1,
+    Hex = 2,
+    List = 3,
+    RuntimeList = 4,
+    Scalar = 5,
+    Countable = 6,
+    Paired = 7,
+
+    Percentage = (1 << SpecializationAttributeOffset),
 };
 
 bool IsConfiguringGlobal();
@@ -75,7 +81,7 @@ public:
 class BasicSetting {
 protected:
     explicit BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
-                          bool save_, bool runtime_modifiable_, Specialization spec,
+                          bool save_, bool runtime_modifiable_, u32 specialization,
                           BasicSetting* other_setting);
 
 public:
@@ -195,7 +201,7 @@ public:
     /**
      * @returns Extra metadata for data representation in frontend implementations.
      */
-    [[nodiscard]] enum Specialization Specialization() const;
+    [[nodiscard]] u32 Specialization() const;
 
     /**
      * @returns Another BasicSetting if one is paired, or nullptr otherwise.
@@ -240,9 +246,8 @@ private:
     const u32 id;                 ///< Unique integer for the setting
     const bool save; ///< Suggests if the setting should be saved and read to a frontend config
     const bool
-        runtime_modifiable; ///< Suggests if the setting can be modified while a guest is running
-    const enum Specialization
-        specialization;                ///< Extra data to identify representation of a setting
+        runtime_modifiable;   ///< Suggests if the setting can be modified while a guest is running
+    const u32 specialization; ///< Extra data to identify representation of a setting
     BasicSetting* const other_setting; ///< A paired setting
 };
 
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index dd91250a1..d1915cb43 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -35,8 +35,7 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
-                     enum Category category_,
-                     enum Specialization specialization = Specialization::Default,
+                     enum Category category_, u32 specialization = Specialization::Default,
                      bool save_ = true, bool runtime_modifiable_ = false,
                      BasicSetting* other_setting = nullptr)
         requires(!ranged)
@@ -57,9 +56,8 @@ public:
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
                      const Type& max_val, const std::string& name, enum Category category_,
-                     enum Specialization specialization = Specialization::Default,
-                     bool save_ = true, bool runtime_modifiable_ = false,
-                     BasicSetting* other_setting = nullptr)
+                     u32 specialization = Specialization::Default, bool save_ = true,
+                     bool runtime_modifiable_ = false, BasicSetting* other_setting = nullptr)
         requires(ranged)
         : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization,
                        other_setting),
@@ -237,8 +235,7 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
-                               Category category_,
-                               enum Specialization specialization = Specialization::Default,
+                               Category category_, u32 specialization = Specialization::Default,
                                bool save_ = true, bool runtime_modifiable_ = false,
                                BasicSetting* other_setting = nullptr)
         requires(!ranged)
@@ -261,8 +258,8 @@ public:
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
                                const Type& max_val, const std::string& name, Category category_,
-                               enum Specialization specialization = Specialization::Default,
-                               bool save_ = true, bool runtime_modifiable_ = false,
+                               u32 specialization = Specialization::Default, bool save_ = true,
+                               bool runtime_modifiable_ = false,
                                BasicSetting* other_setting = nullptr)
         requires(ranged)
         : Setting<Type, true>{
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index cdb89ccda..11714b86d 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -43,17 +43,7 @@ void ConfigureAudio::Setup(const ConfigurationShared::Builder& builder) {
     push(Settings::Category::SystemAudio);
 
     for (auto* setting : settings) {
-        auto* widget = [&]() {
-            // TODO (lat9nq): Let the system manage sink_id
-            if (setting->Id() == Settings::values.volume.Id()) {
-                // volume needs to be a slider (default is line edit)
-                return builder.BuildWidget(setting, apply_funcs, nullptr,
-                                           ConfigurationShared::RequestType::Slider,
-                                           tr("%1%", "Volume percentage (e.g. 50%)"));
-            } else {
-                return builder.BuildWidget(setting, apply_funcs);
-            }
-        }();
+        auto* widget = builder.BuildWidget(setting, apply_funcs);
 
         if (widget == nullptr) {
             continue;
@@ -66,6 +56,7 @@ void ConfigureAudio::Setup(const ConfigurationShared::Builder& builder) {
         layout.addWidget(widget);
 
         if (setting->Id() == Settings::values.sink_id.Id()) {
+            // TODO (lat9nq): Let the system manage sink_id
             sink_combo_box = widget->combobox;
             InitializeAudioSinkComboBox();
 
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 74449e6d4..7263af13f 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -232,10 +232,10 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
     for (const auto setting : Settings::values.linkage.by_category[Settings::Category::Renderer]) {
         ConfigurationShared::Widget* widget = [&]() {
             if (setting->Id() == Settings::values.fsr_sharpening_slider.Id()) {
-                // FSR needs a reversed slider
+                // FSR needs a reversed slider and a 0.5 multiplier
                 return builder.BuildWidget(
                     setting, apply_funcs, ConfigurationShared::RequestType::ReverseSlider, true,
-                    0.5f, nullptr, tr("%1%", "FSR sharpening percentage (e.g. 50%)"));
+                    0.5f, nullptr, tr("%", "FSR sharpening percentage (e.g. 50%)"));
             } else {
                 return builder.BuildWidget(setting, apply_funcs);
             }
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index cb708051e..05706c4de 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -106,16 +106,7 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) {
     push(Settings::values.linkage.by_category[Settings::Category::System]);
 
     for (auto setting : settings) {
-        ConfigurationShared::Widget* widget = [this, setting, &builder]() {
-            if (setting->Id() == Settings::values.speed_limit.Id()) {
-                // speed_limit must be specified to translate the percentage
-                return builder.BuildWidget(setting, apply_funcs, &Settings::values.use_speed_limit,
-                                           ConfigurationShared::RequestType::SpinBox,
-                                           tr("%", "Limit speed percentage (e.g. 50%)"));
-            } else {
-                return builder.BuildWidget(setting, apply_funcs);
-            }
-        }();
+        ConfigurationShared::Widget* widget = builder.BuildWidget(setting, apply_funcs);
 
         if (widget == nullptr) {
             continue;
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index bbcee7488..978bfa590 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -50,6 +50,20 @@ static std::string RelevantDefault(const Settings::BasicSetting& setting) {
     return Settings::IsConfiguringGlobal() ? setting.DefaultToString() : setting.ToStringGlobal();
 }
 
+static QString DefaultSuffix(QWidget* parent, Settings::BasicSetting& setting) {
+    const auto tr = [parent](const char* text, const char* context) {
+        return parent->tr(text, context);
+    };
+
+    if ((setting.Specialization() & Settings::SpecializationAttributeMask) ==
+        Settings::Specialization::Percentage) {
+        std::string context{fmt::format("{} percentage (e.g. 50%)", setting.GetLabel())};
+        return tr("%", context.c_str());
+    }
+
+    return QStringLiteral("");
+}
+
 QPushButton* Widget::CreateRestoreGlobalButton(bool using_global, QWidget* parent) {
     restore_button_count++;
 
@@ -180,7 +194,7 @@ QWidget* Widget::CreateLineEdit(std::function<std::string()>& serializer,
     return line_edit;
 }
 
-QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& format,
+QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& given_suffix,
                               std::function<std::string()>& serializer,
                               std::function<void()>& restore_func,
                               const std::function<void()>& touch) {
@@ -205,7 +219,10 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& fo
 
     int max_val = std::stoi(setting.MaxVal());
 
-    const QString use_format = format == QStringLiteral("") ? QStringLiteral("%1") : format;
+    QString suffix =
+        given_suffix == QStringLiteral("") ? DefaultSuffix(this, setting) : given_suffix;
+
+    const QString use_format = QStringLiteral("%1").append(suffix);
 
     QObject::connect(slider, &QAbstractSlider::valueChanged, [=](int value) {
         int present = (reversed ? max_val - value : value) * multiplier + 0.5f;
@@ -228,7 +245,8 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& fo
     return container;
 }
 
-QWidget* Widget::CreateSpinBox(const QString& suffix, std::function<std::string()>& serializer,
+QWidget* Widget::CreateSpinBox(const QString& given_suffix,
+                               std::function<std::string()>& serializer,
                                std::function<void()>& restore_func,
                                const std::function<void()>& touch) {
     const int min_val =
@@ -237,6 +255,9 @@ QWidget* Widget::CreateSpinBox(const QString& suffix, std::function<std::string(
         setting.Ranged() ? std::stoi(setting.MaxVal()) : std::numeric_limits<int>::max();
     const int default_val = std::stoi(setting.ToString());
 
+    QString suffix =
+        given_suffix == QStringLiteral("") ? DefaultSuffix(this, setting) : given_suffix;
+
     spinbox = new QSpinBox(this);
     spinbox->setRange(min_val, max_val);
     spinbox->setValue(default_val);
@@ -338,7 +359,7 @@ QWidget* Widget::CreateDateTimeEdit(bool disabled, bool restrict,
 
 void Widget::SetupComponent(const QString& label, std::function<void()>& load_func, bool managed,
                             RequestType request, float multiplier,
-                            Settings::BasicSetting* other_setting, const QString& string) {
+                            Settings::BasicSetting* other_setting, const QString& suffix) {
     created = true;
     const auto type = setting.TypeId();
 
@@ -391,7 +412,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
         if (request != RequestType::Default) {
             return request;
         }
-        switch (setting.Specialization()) {
+        switch (setting.Specialization() & Settings::SpecializationTypeMask) {
         case Settings::Specialization::Default:
             return RequestType::Default;
         case Settings::Specialization::Time:
@@ -422,7 +443,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
         switch (request) {
         case RequestType::Slider:
         case RequestType::ReverseSlider:
-            data_component = CreateSlider(request == RequestType::ReverseSlider, multiplier, string,
+            data_component = CreateSlider(request == RequestType::ReverseSlider, multiplier, suffix,
                                           serializer, restore_func, touch);
             break;
         case RequestType::Default:
@@ -434,7 +455,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
                                                 serializer, restore_func, touch);
             break;
         case RequestType::SpinBox:
-            data_component = CreateSpinBox(string, serializer, restore_func, touch);
+            data_component = CreateSpinBox(suffix, serializer, restore_func, touch);
             break;
         case RequestType::HexEdit:
             data_component = CreateHexEdit(serializer, restore_func, touch);
@@ -527,7 +548,7 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
                const ComboboxTranslationMap& combobox_translations_, QWidget* parent_,
                bool runtime_lock_, std::forward_list<std::function<void(bool)>>& apply_funcs_,
                RequestType request, bool managed, float multiplier,
-               Settings::BasicSetting* other_setting, const QString& string)
+               Settings::BasicSetting* other_setting, const QString& suffix)
     : QWidget(parent_), parent{parent_}, translations{translations_},
       combobox_enumerations{combobox_translations_}, setting{*setting_}, apply_funcs{apply_funcs_},
       runtime_lock{runtime_lock_} {
@@ -555,7 +576,7 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
 
     std::function<void()> load_func = []() {};
 
-    SetupComponent(label, load_func, managed, request, multiplier, other_setting, string);
+    SetupComponent(label, load_func, managed, request, multiplier, other_setting, suffix);
 
     if (!created) {
         LOG_WARNING(Frontend, "No widget was created for \"{}\"", setting.GetLabel());
@@ -587,7 +608,7 @@ Builder::~Builder() = default;
 Widget* Builder::BuildWidget(Settings::BasicSetting* setting,
                              std::forward_list<std::function<void(bool)>>& apply_funcs,
                              RequestType request, bool managed, float multiplier,
-                             Settings::BasicSetting* other_setting, const QString& string) const {
+                             Settings::BasicSetting* other_setting, const QString& suffix) const {
     if (!Settings::IsConfiguringGlobal() && !setting->Switchable()) {
         return nullptr;
     }
@@ -598,14 +619,14 @@ Widget* Builder::BuildWidget(Settings::BasicSetting* setting,
     }
 
     return new Widget(setting, *translations, *combobox_translations, parent, runtime_lock,
-                      apply_funcs, request, managed, multiplier, other_setting, string);
+                      apply_funcs, request, managed, multiplier, other_setting, suffix);
 }
 
 Widget* Builder::BuildWidget(Settings::BasicSetting* setting,
                              std::forward_list<std::function<void(bool)>>& apply_funcs,
                              Settings::BasicSetting* other_setting, RequestType request,
-                             const QString& string) const {
-    return BuildWidget(setting, apply_funcs, request, true, 1.0f, other_setting, string);
+                             const QString& suffix) const {
+    return BuildWidget(setting, apply_funcs, request, true, 1.0f, other_setting, suffix);
 }
 
 const ComboboxTranslationMap& Builder::ComboboxTranslations() const {
diff --git a/src/yuzu/configuration/shared_widget.h b/src/yuzu/configuration/shared_widget.h
index e8c281b81..b3f9efd78 100644
--- a/src/yuzu/configuration/shared_widget.h
+++ b/src/yuzu/configuration/shared_widget.h
@@ -58,14 +58,14 @@ public:
      * @param managed Set true if the caller will set up component data and handling
      * @param multiplier Value to multiply the slider feedback label
      * @param other_setting Second setting to modify, to replace the label with a checkbox
-     * @param string Set to specify formats for Slider feedback labels or SpinBox
+     * @param suffix Set to specify formats for Slider feedback labels or SpinBox
      */
     explicit Widget(Settings::BasicSetting* setting, const TranslationMap& translations,
                     const ComboboxTranslationMap& combobox_translations, QWidget* parent,
                     bool runtime_lock, std::forward_list<std::function<void(bool)>>& apply_funcs_,
                     RequestType request = RequestType::Default, bool managed = true,
                     float multiplier = 1.0f, Settings::BasicSetting* other_setting = nullptr,
-                    const QString& string = QStringLiteral(""));
+                    const QString& suffix = QStringLiteral(""));
     virtual ~Widget();
 
     /**
@@ -95,7 +95,7 @@ public:
 private:
     void SetupComponent(const QString& label, std::function<void()>& load_func, bool managed,
                         RequestType request, float multiplier,
-                        Settings::BasicSetting* other_setting, const QString& string);
+                        Settings::BasicSetting* other_setting, const QString& suffix);
 
     QLabel* CreateLabel(const QString& text);
     QWidget* CreateCheckBox(Settings::BasicSetting* bool_setting, const QString& label,
@@ -111,7 +111,7 @@ private:
                             bool managed = true);
     QWidget* CreateHexEdit(std::function<std::string()>& serializer,
                            std::function<void()>& restore_func, const std::function<void()>& touch);
-    QWidget* CreateSlider(bool reversed, float multiplier, const QString& format,
+    QWidget* CreateSlider(bool reversed, float multiplier, const QString& suffix,
                           std::function<std::string()>& serializer,
                           std::function<void()>& restore_func, const std::function<void()>& touch);
     QWidget* CreateDateTimeEdit(bool disabled, bool restrict,
@@ -140,13 +140,13 @@ public:
                         std::forward_list<std::function<void(bool)>>& apply_funcs,
                         RequestType request = RequestType::Default, bool managed = true,
                         float multiplier = 1.0f, Settings::BasicSetting* other_setting = nullptr,
-                        const QString& string = QStringLiteral("")) const;
+                        const QString& suffix = QStringLiteral("")) const;
 
     Widget* BuildWidget(Settings::BasicSetting* setting,
                         std::forward_list<std::function<void(bool)>>& apply_funcs,
                         Settings::BasicSetting* other_setting,
                         RequestType request = RequestType::Default,
-                        const QString& string = QStringLiteral("")) const;
+                        const QString& suffix = QStringLiteral("")) const;
 
     const ComboboxTranslationMap& ComboboxTranslations() const;
 
-- 
cgit v1.2.3


From 54d58130a0818efc4d70d72624f734f2b6f0a6d3 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 21 Jun 2023 15:38:30 -0400
Subject: settings_setting: Silence shadowing warnings

---
 src/common/settings_setting.h | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index d1915cb43..eb46b2b6d 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -35,12 +35,12 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
-                     enum Category category_, u32 specialization = Specialization::Default,
+                     enum Category category_, u32 specialization_ = Specialization::Default,
                      bool save_ = true, bool runtime_modifiable_ = false,
-                     BasicSetting* other_setting = nullptr)
+                     BasicSetting* other_setting_ = nullptr)
         requires(!ranged)
-        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization,
-                       other_setting),
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization_,
+                       other_setting_),
           value{default_val}, default_value{default_val} {}
     virtual ~Setting() = default;
 
@@ -56,11 +56,11 @@ public:
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
                      const Type& max_val, const std::string& name, enum Category category_,
-                     u32 specialization = Specialization::Default, bool save_ = true,
-                     bool runtime_modifiable_ = false, BasicSetting* other_setting = nullptr)
+                     u32 specialization_ = Specialization::Default, bool save_ = true,
+                     bool runtime_modifiable_ = false, BasicSetting* other_setting_ = nullptr)
         requires(ranged)
-        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization,
-                       other_setting),
+        : BasicSetting(linkage, name, category_, save_, runtime_modifiable_, specialization_,
+                       other_setting_),
           value{default_val}, default_value{default_val}, maximum{max_val}, minimum{min_val} {}
 
     /**
@@ -235,13 +235,13 @@ public:
      * @param category_ Category of the setting AKA INI group
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
-                               Category category_, u32 specialization = Specialization::Default,
+                               Category category_, u32 specialization_ = Specialization::Default,
                                bool save_ = true, bool runtime_modifiable_ = false,
-                               BasicSetting* other_setting = nullptr)
+                               BasicSetting* other_setting_ = nullptr)
         requires(!ranged)
         : Setting<Type, false>{
-              linkage, default_val,         name,         category_, specialization,
-              save_,   runtime_modifiable_, other_setting} {
+              linkage, default_val,         name,          category_, specialization_,
+              save_,   runtime_modifiable_, other_setting_} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
     virtual ~SwitchableSetting() = default;
@@ -258,13 +258,14 @@ public:
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
                                const Type& max_val, const std::string& name, Category category_,
-                               u32 specialization = Specialization::Default, bool save_ = true,
+                               u32 specialization_ = Specialization::Default, bool save_ = true,
                                bool runtime_modifiable_ = false,
-                               BasicSetting* other_setting = nullptr)
+                               BasicSetting* other_setting_ = nullptr)
         requires(ranged)
-        : Setting<Type, true>{
-              linkage, default_val,         min_val,      max_val, name, category_, specialization,
-              save_,   runtime_modifiable_, other_setting} {
+        : Setting<Type, true>{linkage,         default_val, min_val,
+                              max_val,         name,        category_,
+                              specialization_, save_,       runtime_modifiable_,
+                              other_setting_} {
         linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
     }
 
-- 
cgit v1.2.3


From 8497fb0a046a208b0abcda9ba31ec77866ec922d Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 21 Jun 2023 15:39:28 -0400
Subject: settings_enums: Remove casting

Not sure how I missed this earlier, but these vectors can be constructed
using the type of the enum.
---
 src/common/settings_enums.h | 110 ++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index c380e409e..a5f87c956 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -12,60 +12,60 @@ namespace Settings {
 
 template <typename T>
 struct Canonicalization {
-    static constexpr std::vector<std::pair<std::string, u32>> Get();
+    static constexpr std::vector<std::pair<std::string, T>> Get();
 };
 
-#define PAIR_45(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_46(N, __VA_ARGS__))
-#define PAIR_44(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_45(N, __VA_ARGS__))
-#define PAIR_43(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_44(N, __VA_ARGS__))
-#define PAIR_42(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_43(N, __VA_ARGS__))
-#define PAIR_41(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_42(N, __VA_ARGS__))
-#define PAIR_40(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_41(N, __VA_ARGS__))
-#define PAIR_39(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_40(N, __VA_ARGS__))
-#define PAIR_38(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_39(N, __VA_ARGS__))
-#define PAIR_37(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_38(N, __VA_ARGS__))
-#define PAIR_36(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_37(N, __VA_ARGS__))
-#define PAIR_35(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_36(N, __VA_ARGS__))
-#define PAIR_34(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_35(N, __VA_ARGS__))
-#define PAIR_33(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_34(N, __VA_ARGS__))
-#define PAIR_32(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_33(N, __VA_ARGS__))
-#define PAIR_31(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_32(N, __VA_ARGS__))
-#define PAIR_30(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_31(N, __VA_ARGS__))
-#define PAIR_29(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_30(N, __VA_ARGS__))
-#define PAIR_28(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_29(N, __VA_ARGS__))
-#define PAIR_27(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_28(N, __VA_ARGS__))
-#define PAIR_26(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_27(N, __VA_ARGS__))
-#define PAIR_25(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_26(N, __VA_ARGS__))
-#define PAIR_24(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_25(N, __VA_ARGS__))
-#define PAIR_23(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_24(N, __VA_ARGS__))
-#define PAIR_22(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_23(N, __VA_ARGS__))
-#define PAIR_21(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_22(N, __VA_ARGS__))
-#define PAIR_20(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_21(N, __VA_ARGS__))
-#define PAIR_19(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_20(N, __VA_ARGS__))
-#define PAIR_18(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_19(N, __VA_ARGS__))
-#define PAIR_17(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_18(N, __VA_ARGS__))
-#define PAIR_16(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_17(N, __VA_ARGS__))
-#define PAIR_15(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_16(N, __VA_ARGS__))
-#define PAIR_14(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_15(N, __VA_ARGS__))
-#define PAIR_13(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_14(N, __VA_ARGS__))
-#define PAIR_12(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_13(N, __VA_ARGS__))
-#define PAIR_11(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_12(N, __VA_ARGS__))
-#define PAIR_10(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_11(N, __VA_ARGS__))
-#define PAIR_9(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_10(N, __VA_ARGS__))
-#define PAIR_8(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_9(N, __VA_ARGS__))
-#define PAIR_7(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_8(N, __VA_ARGS__))
-#define PAIR_6(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_7(N, __VA_ARGS__))
-#define PAIR_5(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_6(N, __VA_ARGS__))
-#define PAIR_4(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_5(N, __VA_ARGS__))
-#define PAIR_3(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_4(N, __VA_ARGS__))
-#define PAIR_2(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_3(N, __VA_ARGS__))
-#define PAIR_1(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_2(N, __VA_ARGS__))
-#define PAIR(N, X, ...) {#X, static_cast<u32>(N::X)} __VA_OPT__(, PAIR_1(N, __VA_ARGS__))
+#define PAIR_45(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_46(N, __VA_ARGS__))
+#define PAIR_44(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_45(N, __VA_ARGS__))
+#define PAIR_43(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_44(N, __VA_ARGS__))
+#define PAIR_42(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_43(N, __VA_ARGS__))
+#define PAIR_41(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_42(N, __VA_ARGS__))
+#define PAIR_40(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_41(N, __VA_ARGS__))
+#define PAIR_39(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_40(N, __VA_ARGS__))
+#define PAIR_38(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_39(N, __VA_ARGS__))
+#define PAIR_37(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_38(N, __VA_ARGS__))
+#define PAIR_36(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_37(N, __VA_ARGS__))
+#define PAIR_35(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_36(N, __VA_ARGS__))
+#define PAIR_34(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_35(N, __VA_ARGS__))
+#define PAIR_33(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_34(N, __VA_ARGS__))
+#define PAIR_32(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_33(N, __VA_ARGS__))
+#define PAIR_31(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_32(N, __VA_ARGS__))
+#define PAIR_30(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_31(N, __VA_ARGS__))
+#define PAIR_29(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_30(N, __VA_ARGS__))
+#define PAIR_28(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_29(N, __VA_ARGS__))
+#define PAIR_27(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_28(N, __VA_ARGS__))
+#define PAIR_26(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_27(N, __VA_ARGS__))
+#define PAIR_25(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_26(N, __VA_ARGS__))
+#define PAIR_24(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_25(N, __VA_ARGS__))
+#define PAIR_23(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_24(N, __VA_ARGS__))
+#define PAIR_22(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_23(N, __VA_ARGS__))
+#define PAIR_21(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_22(N, __VA_ARGS__))
+#define PAIR_20(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_21(N, __VA_ARGS__))
+#define PAIR_19(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_20(N, __VA_ARGS__))
+#define PAIR_18(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_19(N, __VA_ARGS__))
+#define PAIR_17(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_18(N, __VA_ARGS__))
+#define PAIR_16(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_17(N, __VA_ARGS__))
+#define PAIR_15(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_16(N, __VA_ARGS__))
+#define PAIR_14(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_15(N, __VA_ARGS__))
+#define PAIR_13(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_14(N, __VA_ARGS__))
+#define PAIR_12(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_13(N, __VA_ARGS__))
+#define PAIR_11(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_12(N, __VA_ARGS__))
+#define PAIR_10(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_11(N, __VA_ARGS__))
+#define PAIR_9(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_10(N, __VA_ARGS__))
+#define PAIR_8(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_9(N, __VA_ARGS__))
+#define PAIR_7(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_8(N, __VA_ARGS__))
+#define PAIR_6(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_7(N, __VA_ARGS__))
+#define PAIR_5(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_6(N, __VA_ARGS__))
+#define PAIR_4(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_5(N, __VA_ARGS__))
+#define PAIR_3(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_4(N, __VA_ARGS__))
+#define PAIR_2(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_3(N, __VA_ARGS__))
+#define PAIR_1(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_2(N, __VA_ARGS__))
+#define PAIR(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_1(N, __VA_ARGS__))
 
 #define ENUM(NAME, ...)                                                                            \
     enum class NAME : u32 { __VA_ARGS__ };                                                         \
     template <>                                                                                    \
-    constexpr std::vector<std::pair<std::string, u32>> Canonicalization<NAME>::Get() {             \
+    constexpr std::vector<std::pair<std::string, NAME>> Canonicalization<NAME>::Get() {            \
         return {PAIR(NAME, __VA_ARGS__)};                                                          \
     }
 
@@ -77,12 +77,12 @@ enum class AudioEngine : u32 {
 };
 
 template <>
-constexpr std::vector<std::pair<std::string, u32>> Canonicalization<AudioEngine>::Get() {
+constexpr std::vector<std::pair<std::string, AudioEngine>> Canonicalization<AudioEngine>::Get() {
     return {
-        {"auto", static_cast<u32>(AudioEngine::Auto)},
-        {"cubeb", static_cast<u32>(AudioEngine::Cubeb)},
-        {"sdl2", static_cast<u32>(AudioEngine::Sdl2)},
-        {"null", static_cast<u32>(AudioEngine::Null)},
+        {"auto", AudioEngine::Auto},
+        {"cubeb", AudioEngine::Cubeb},
+        {"sdl2", AudioEngine::Sdl2},
+        {"null", AudioEngine::Null},
     };
 }
 
@@ -132,7 +132,7 @@ template <typename Type>
 constexpr std::string CanonicalizeEnum(Type id) {
     const auto group = Canonicalization<Type>::Get();
     for (auto& [name, value] : group) {
-        if (static_cast<Type>(value) == id) {
+        if (value == id) {
             return name;
         }
     }
@@ -144,7 +144,7 @@ constexpr Type ToEnum(const std::string& canonicalization) {
     const auto group = Canonicalization<Type>::Get();
     for (auto& [name, value] : group) {
         if (name == canonicalization) {
-            return static_cast<Type>(value);
+            return value;
         }
     }
     return {};
-- 
cgit v1.2.3


From 52cc7b438bbaccb440382d0fd38d2d0805907814 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 21 Jun 2023 17:06:10 -0400
Subject: settings_common: Remove unncessary enum spec

---
 src/common/settings_common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 6b717deb1..669d32204 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -80,8 +80,8 @@ public:
  */
 class BasicSetting {
 protected:
-    explicit BasicSetting(Linkage& linkage, const std::string& name, enum Category category_,
-                          bool save_, bool runtime_modifiable_, u32 specialization,
+    explicit BasicSetting(Linkage& linkage, const std::string& name, Category category_, bool save_,
+                          bool runtime_modifiable_, u32 specialization,
                           BasicSetting* other_setting);
 
 public:
-- 
cgit v1.2.3


From e7f01128f181a7b754f6d5f94122cde059c7ed1a Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 21 Jun 2023 21:41:06 -0400
Subject: settings: Give indices to enums

---
 src/common/settings_common.h  |  5 +++++
 src/common/settings_enums.h   | 28 ++++++++++++++++++++++------
 src/common/settings_setting.h |  9 +++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 669d32204..b355384a4 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -220,6 +220,11 @@ public:
      */
     [[nodiscard]] virtual constexpr bool Ranged() const = 0;
 
+    /**
+     * @returns The index of the enum if the underlying setting type is an enum, else max of u32.
+     */
+    [[nodiscard]] virtual constexpr u32 EnumIndex() const = 0;
+
     /*
      * Switchable settings
      */
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index a5f87c956..f9bb75840 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -11,8 +11,9 @@
 namespace Settings {
 
 template <typename T>
-struct Canonicalization {
-    static constexpr std::vector<std::pair<std::string, T>> Get();
+struct EnumMetadata {
+    static constexpr std::vector<std::pair<std::string, T>> Canonicalizations();
+    static constexpr u32 Index();
 };
 
 #define PAIR_45(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_46(N, __VA_ARGS__))
@@ -65,10 +66,17 @@ struct Canonicalization {
 #define ENUM(NAME, ...)                                                                            \
     enum class NAME : u32 { __VA_ARGS__ };                                                         \
     template <>                                                                                    \
-    constexpr std::vector<std::pair<std::string, NAME>> Canonicalization<NAME>::Get() {            \
+    constexpr std::vector<std::pair<std::string, NAME>> EnumMetadata<NAME>::Canonicalizations() {  \
         return {PAIR(NAME, __VA_ARGS__)};                                                          \
+    }                                                                                              \
+    template <>                                                                                    \
+    constexpr u32 EnumMetadata<NAME>::Index() {                                                    \
+        return __COUNTER__;                                                                        \
     }
 
+// AudioEngine must be specified discretely due to having existing but slightly different
+// canonicalizations
+// TODO (lat9nq): Remove explicit definition of AudioEngine/sink_id
 enum class AudioEngine : u32 {
     Auto,
     Cubeb,
@@ -77,7 +85,8 @@ enum class AudioEngine : u32 {
 };
 
 template <>
-constexpr std::vector<std::pair<std::string, AudioEngine>> Canonicalization<AudioEngine>::Get() {
+constexpr std::vector<std::pair<std::string, AudioEngine>>
+EnumMetadata<AudioEngine>::Canonicalizations() {
     return {
         {"auto", AudioEngine::Auto},
         {"cubeb", AudioEngine::Cubeb},
@@ -86,6 +95,13 @@ constexpr std::vector<std::pair<std::string, AudioEngine>> Canonicalization<Audi
     };
 }
 
+template <>
+constexpr u32 EnumMetadata<AudioEngine>::Index() {
+    // This is just a sufficiently large number that is more than the number of other enums declared
+    // here
+    return 100;
+}
+
 ENUM(AudioMode, Mono, Stereo, Surround);
 
 ENUM(Language, Japanese, EnglishAmerican, French, German, Italian, Spanish, Chinese, Korean, Dutch,
@@ -130,7 +146,7 @@ ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
 
 template <typename Type>
 constexpr std::string CanonicalizeEnum(Type id) {
-    const auto group = Canonicalization<Type>::Get();
+    const auto group = EnumMetadata<Type>::Canonicalizations();
     for (auto& [name, value] : group) {
         if (value == id) {
             return name;
@@ -141,7 +157,7 @@ constexpr std::string CanonicalizeEnum(Type id) {
 
 template <typename Type>
 constexpr Type ToEnum(const std::string& canonicalization) {
-    const auto group = Canonicalization<Type>::Get();
+    const auto group = EnumMetadata<Type>::Canonicalizations();
     for (auto& [name, value] : group) {
         if (name == canonicalization) {
             return value;
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index eb46b2b6d..2e708fa0d 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <limits>
 #include <map>
 #include <optional>
 #include <stdexcept>
@@ -197,6 +198,14 @@ public:
         return std::type_index(typeid(Type));
     }
 
+    constexpr u32 EnumIndex() const override {
+        if constexpr (std::is_enum<Type>()) {
+            return EnumMetadata<Type>::Index();
+        } else {
+            return std::numeric_limits<u32>::max();
+        }
+    }
+
     virtual std::string MinVal() const override {
         return this->ToString(minimum);
     }
-- 
cgit v1.2.3


From ff6a5031d5ea509375a5dc1ee7b9eeddda6d9ebc Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 4 Jul 2023 16:48:48 -0400
Subject: settings: Require time zone setting value for stirng

---
 src/common/settings.cpp                                 | 4 ++--
 src/common/settings.h                                   | 2 +-
 src/core/hle/service/time/time_zone_content_manager.cpp | 3 ++-
 src/yuzu/configuration/shared_translation.cpp           | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index d9948dde8..78fa99113 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -66,8 +66,8 @@ SWITCHABLE(u8, true);
 
 Values values;
 
-std::string GetTimeZoneString() {
-    const auto time_zone_index = static_cast<std::size_t>(values.time_zone_index.GetValue());
+std::string GetTimeZoneString(TimeZone time_zone) {
+    const auto time_zone_index = static_cast<std::size_t>(time_zone);
     ASSERT(time_zone_index < Common::TimeZone::GetTimeZoneStrings().size());
 
     std::string location_name;
diff --git a/src/common/settings.h b/src/common/settings.h
index c4339cb1f..928636c72 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -516,7 +516,7 @@ bool IsFastmemEnabled();
 
 float Volume();
 
-std::string GetTimeZoneString();
+std::string GetTimeZoneString(TimeZone time_zone);
 
 void LogSettings();
 
diff --git a/src/core/hle/service/time/time_zone_content_manager.cpp b/src/core/hle/service/time/time_zone_content_manager.cpp
index 5d60be67a..565f6b39b 100644
--- a/src/core/hle/service/time/time_zone_content_manager.cpp
+++ b/src/core/hle/service/time/time_zone_content_manager.cpp
@@ -76,7 +76,8 @@ TimeZoneContentManager::TimeZoneContentManager(Core::System& system_)
     : system{system_}, location_name_cache{BuildLocationNameCache(system)} {}
 
 void TimeZoneContentManager::Initialize(TimeManager& time_manager) {
-    const auto timezone_setting = Settings::GetTimeZoneString();
+    const auto timezone_setting =
+        Settings::GetTimeZoneString(Settings::values.time_zone_index.GetValue());
 
     if (FileSys::VirtualFile vfs_file;
         GetTimeZoneInfoFile(timezone_setting, vfs_file) == ResultSuccess) {
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 05cc942de..fadc8034e 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -318,7 +318,8 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
          {
              {static_cast<u32>(Settings::TimeZone::Auto),
               tr("Auto (%1)", "Auto select time zone")
-                  .arg(QString::fromStdString(Settings::GetTimeZoneString()))},
+                  .arg(QString::fromStdString(
+                      Settings::GetTimeZoneString(Settings::TimeZone::Auto)))},
              {static_cast<u32>(Settings::TimeZone::Default),
               tr("Default (%1)", "Default time zone")
                   .arg(QString::fromStdString(Common::TimeZone::GetDefaultTimeZone()))},
-- 
cgit v1.2.3


From 127b3da0f13ea0850c10115d45488dfe32a0a3f4 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 17 Jul 2023 19:59:22 -0400
Subject: core,common: Give memory layout setting an enum

Allows for 6GB and 8GB layouts to be selected.
---
 src/common/settings.h                                |  8 ++++++--
 src/common/settings_enums.h                          |  2 ++
 src/core/core.cpp                                    | 10 +++++++---
 .../kernel/board/nintendo/nx/k_system_control.cpp    | 20 ++++++++++++++++----
 4 files changed, 31 insertions(+), 9 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 928636c72..618c34334 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -153,8 +153,12 @@ struct Values {
 
     // Core
     SwitchableSetting<bool> use_multi_core{linkage, true, "use_multi_core", Category::Core};
-    SwitchableSetting<bool> use_unsafe_extended_memory_layout{
-        linkage, false, "use_unsafe_extended_memory_layout", Category::Core};
+    SwitchableSetting<MemoryLayout, true> memory_layout_mode{linkage,
+                                                             MemoryLayout::Memory_4Gb,
+                                                             MemoryLayout::Memory_4Gb,
+                                                             MemoryLayout::Memory_8Gb,
+                                                             "memory_layout_mode",
+                                                             Category::Core};
     SwitchableSetting<bool> use_speed_limit{
         linkage, true, "use_speed_limit", Category::Core, Specialization::Paired, false, true};
     SwitchableSetting<u16, true> speed_limit{linkage,
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index f9bb75840..a1a29ebf6 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -131,6 +131,8 @@ ENUM(GpuAccuracy, Normal, High, Extreme);
 
 ENUM(CpuAccuracy, Auto, Accurate, Unsafe, Paranoid);
 
+ENUM(MemoryLayout, Memory_4Gb, Memory_6Gb, Memory_8Gb);
+
 ENUM(FullscreenMode, Borderless, Exclusive);
 
 ENUM(NvdecEmulation, Off, Cpu, Gpu);
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e2902a91f..951942083 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -12,6 +12,7 @@
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "common/settings.h"
+#include "common/settings_enums.h"
 #include "common/string_util.h"
 #include "core/arm/exclusive_monitor.h"
 #include "core/core.h"
@@ -140,7 +141,8 @@ struct System::Impl {
         device_memory = std::make_unique<Core::DeviceMemory>();
 
         is_multicore = Settings::values.use_multi_core.GetValue();
-        extended_memory_layout = Settings::values.use_unsafe_extended_memory_layout.GetValue();
+        extended_memory_layout =
+            Settings::values.memory_layout_mode.GetValue() != Settings::MemoryLayout::Memory_4Gb;
 
         core_timing.SetMulticore(is_multicore);
         core_timing.Initialize([&system]() { system.RegisterHostThread(); });
@@ -168,7 +170,8 @@ struct System::Impl {
     void ReinitializeIfNecessary(System& system) {
         const bool must_reinitialize =
             is_multicore != Settings::values.use_multi_core.GetValue() ||
-            extended_memory_layout != Settings::values.use_unsafe_extended_memory_layout.GetValue();
+            extended_memory_layout != (Settings::values.memory_layout_mode.GetValue() !=
+                                       Settings::MemoryLayout::Memory_4Gb);
 
         if (!must_reinitialize) {
             return;
@@ -177,7 +180,8 @@ struct System::Impl {
         LOG_DEBUG(Kernel, "Re-initializing");
 
         is_multicore = Settings::values.use_multi_core.GetValue();
-        extended_memory_layout = Settings::values.use_unsafe_extended_memory_layout.GetValue();
+        extended_memory_layout =
+            Settings::values.memory_layout_mode.GetValue() != Settings::MemoryLayout::Memory_4Gb;
 
         Initialize(system);
     }
diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
index 49bdc671e..7320b87b9 100644
--- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
+++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
@@ -35,13 +35,25 @@ namespace {
 using namespace Common::Literals;
 
 u32 GetMemorySizeForInit() {
-    return Settings::values.use_unsafe_extended_memory_layout ? Smc::MemorySize_8GB
-                                                              : Smc::MemorySize_4GB;
+    switch (Settings::values.memory_layout_mode.GetValue()) {
+    case Settings::MemoryLayout::Memory_4Gb:
+        return Smc::MemorySize_4GB;
+    case Settings::MemoryLayout::Memory_6Gb:
+        return Smc::MemorySize_6GB;
+    case Settings::MemoryLayout::Memory_8Gb:
+        return Smc::MemorySize_8GB;
+    }
 }
 
 Smc::MemoryArrangement GetMemoryArrangeForInit() {
-    return Settings::values.use_unsafe_extended_memory_layout ? Smc::MemoryArrangement_8GB
-                                                              : Smc::MemoryArrangement_4GB;
+    switch (Settings::values.memory_layout_mode.GetValue()) {
+    case Settings::MemoryLayout::Memory_4Gb:
+        return Smc::MemoryArrangement_4GB;
+    case Settings::MemoryLayout::Memory_6Gb:
+        return Smc::MemoryArrangement_6GB;
+    case Settings::MemoryLayout::Memory_8Gb:
+        return Smc::MemoryArrangement_8GB;
+    }
 }
 } // namespace
 
-- 
cgit v1.2.3


From 267f3c7905972ad78713cd92f96e3073ea1c8996 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:36:20 -0400
Subject: settings: Cleanup

Addresses review feedback

Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>
---
 src/common/CMakeLists.txt     |  1 +
 src/common/settings.cpp       |  5 +--
 src/common/settings_setting.h | 77 ++++++++++++++++++++++++++-----------------
 3 files changed, 51 insertions(+), 32 deletions(-)

(limited to 'src/common')

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index e205055e6..bf97d9ba2 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -205,6 +205,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     -Werror=unreachable-code-aggressive
   )
   target_compile_definitions(common PRIVATE
+    # Clang 14 and earlier have errors when explicitly instantiating Settings::Setting
     $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
   )
 endif()
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 78fa99113..59d24a053 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -25,6 +25,7 @@
 
 namespace Settings {
 
+// Clang 14 and earlier have errors when explicitly instantiating these classes
 #ifndef CANNOT_EXPLICITLY_INSTANTIATE
 #define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>
 #define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>
@@ -113,11 +114,11 @@ void LogSettings() {
 
         for (const auto& setting : settings) {
             if (setting->Id() == values.yuzu_token.Id()) {
-                // Hide the token secret, which could be used to share patreon builds
+                // Hide the token secret, for security reasons.
                 continue;
             }
 
-            std::string name = fmt::format(
+            const auto name = fmt::format(
                 "{:c}{:c} {}.{}", setting->ToString() == setting->DefaultToString() ? '-' : 'M',
                 setting->UsingGlobal() ? '-' : 'C', TranslateCategory(category),
                 setting->GetLabel());
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 2e708fa0d..959b4f3f9 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -34,6 +34,10 @@ public:
      * @param default_val Initial value of the setting, and default value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
+     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param save_ Suggests that this should or should not be saved to a frontend config file
+     * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
+     * @param other_setting_ A second Setting to associate to this one in metadata
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
                      enum Category category_, u32 specialization_ = Specialization::Default,
@@ -54,6 +58,10 @@ public:
      * @param max_val Sets the maximum allowed value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
+     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param save_ Suggests that this should or should not be saved to a frontend config file
+     * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
+     * @param other_setting_ A second Setting to associate to this one in metadata
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
                      const Type& max_val, const std::string& name, enum Category category_,
@@ -93,18 +101,19 @@ public:
     }
 
     [[nodiscard]] constexpr bool IsEnum() const override {
-        return std::is_enum<Type>::value;
+        return std::is_enum_v<Type>;
     }
 
 protected:
-    std::string ToString(const Type& value_) const {
-        if constexpr (std::is_same<Type, std::string>()) {
+    [[nodiscard]] std::string ToString(const Type& value_) const {
+        if constexpr (std::is_same_v<Type, std::string>) {
             return value_;
-        } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
+        } else if constexpr (std::is_same_v<Type, std::optional<u32>>) {
             return value_.has_value() ? std::to_string(*value_) : "none";
-        } else if constexpr (std::is_same<Type, bool>()) {
+        } else if constexpr (std::is_same_v<Type, bool>) {
             return value_ ? "true" : "false";
-        } else if constexpr (std::is_same<Type, AudioEngine>()) {
+        } else if constexpr (std::is_same_v<Type, AudioEngine>) {
+            // Compatibility with old AudioEngine setting being a string
             return CanonicalizeEnum(value_);
         } else {
             return std::to_string(static_cast<u64>(value_));
@@ -118,7 +127,7 @@ public:
      *
      * @returns The current setting as a std::string
      */
-    std::string ToString() const override {
+    [[nodiscard]] std::string ToString() const override {
         return ToString(this->GetValue());
     }
 
@@ -127,7 +136,7 @@ public:
      *
      * @returns The default value as a string.
      */
-    std::string DefaultToString() const override {
+    [[nodiscard]] std::string DefaultToString() const override {
         return ToString(default_value);
     }
 
@@ -159,19 +168,19 @@ public:
      *
      * @param input The desired value
      */
-    void LoadString(const std::string& input) override {
+    void LoadString(const std::string& input) override final {
         if (input.empty()) {
             this->SetValue(this->GetDefault());
             return;
         }
         try {
-            if constexpr (std::is_same<Type, std::string>()) {
+            if constexpr (std::is_same_v<Type, std::string>) {
                 this->SetValue(input);
-            } else if constexpr (std::is_same<Type, std::optional<u32>>()) {
+            } else if constexpr (std::is_same_v<Type, std::optional<u32>>) {
                 this->SetValue(static_cast<u32>(std::stoul(input)));
-            } else if constexpr (std::is_same<Type, bool>()) {
+            } else if constexpr (std::is_same_v<Type, bool>) {
                 this->SetValue(input == "true");
-            } else if constexpr (std::is_same<Type, AudioEngine>()) {
+            } else if constexpr (std::is_same_v<Type, AudioEngine>) {
                 this->SetValue(ToEnum<Type>(input));
             } else {
                 this->SetValue(static_cast<Type>(std::stoll(input)));
@@ -181,8 +190,8 @@ public:
         }
     }
 
-    [[nodiscard]] std::string constexpr Canonicalize() const override {
-        if constexpr (std::is_enum<Type>::value) {
+    [[nodiscard]] std::string constexpr Canonicalize() const override final {
+        if constexpr (std::is_enum_v<Type>) {
             return CanonicalizeEnum(this->GetValue());
         } else {
             return ToString(this->GetValue());
@@ -194,26 +203,26 @@ public:
      *
      * @returns the type_index of the setting's type
      */
-    virtual std::type_index TypeId() const override {
+    [[nodiscard]] std::type_index TypeId() const override final {
         return std::type_index(typeid(Type));
     }
 
-    constexpr u32 EnumIndex() const override {
-        if constexpr (std::is_enum<Type>()) {
+    [[nodiscard]] constexpr u32 EnumIndex() const override final {
+        if constexpr (std::is_enum_v<Type>) {
             return EnumMetadata<Type>::Index();
         } else {
             return std::numeric_limits<u32>::max();
         }
     }
 
-    virtual std::string MinVal() const override {
+    [[nodiscard]] std::string MinVal() const override final {
         return this->ToString(minimum);
     }
-    virtual std::string MaxVal() const override {
+    [[nodiscard]] std::string MaxVal() const override final {
         return this->ToString(maximum);
     }
 
-    constexpr bool Ranged() const override {
+    [[nodiscard]] constexpr bool Ranged() const override {
         return ranged;
     }
 
@@ -242,6 +251,10 @@ public:
      * @param default_val Initial value of the setting, and default value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
+     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param save_ Suggests that this should or should not be saved to a frontend config file
+     * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
+     * @param other_setting_ A second Setting to associate to this one in metadata
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
                                Category category_, u32 specialization_ = Specialization::Default,
@@ -264,6 +277,10 @@ public:
      * @param max_val Sets the maximum allowed value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
+     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param save_ Suggests that this should or should not be saved to a frontend config file
+     * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
+     * @param other_setting_ A second Setting to associate to this one in metadata
      */
     explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
                                const Type& max_val, const std::string& name, Category category_,
@@ -284,7 +301,7 @@ public:
      *
      * @param to_global Whether to use the global or custom setting.
      */
-    void SetGlobal(bool to_global) override {
+    void SetGlobal(bool to_global) override final {
         use_global = to_global;
     }
 
@@ -293,7 +310,7 @@ public:
      *
      * @returns The global state
      */
-    [[nodiscard]] bool UsingGlobal() const override {
+    [[nodiscard]] bool UsingGlobal() const override final {
         return use_global;
     }
 
@@ -305,13 +322,13 @@ public:
      *
      * @returns The required value of the setting
      */
-    [[nodiscard]] virtual const Type& GetValue() const override {
+    [[nodiscard]] const Type& GetValue() const override final {
         if (use_global) {
             return this->value;
         }
         return custom;
     }
-    [[nodiscard]] virtual const Type& GetValue(bool need_global) const {
+    [[nodiscard]] const Type& GetValue(bool need_global) const {
         if (use_global || need_global) {
             return this->value;
         }
@@ -323,7 +340,7 @@ public:
      *
      * @param val The new value
      */
-    void SetValue(const Type& val) override {
+    void SetValue(const Type& val) override final {
         Type temp{ranged ? std::clamp(val, this->minimum, this->maximum) : val};
         if (use_global) {
             std::swap(this->value, temp);
@@ -332,11 +349,11 @@ public:
         }
     }
 
-    [[nodiscard]] virtual constexpr bool Switchable() const override {
+    [[nodiscard]] constexpr bool Switchable() const override final {
         return true;
     }
 
-    [[nodiscard]] virtual std::string ToStringGlobal() const override {
+    [[nodiscard]] std::string ToStringGlobal() const override final {
         return this->ToString(this->value);
     }
 
@@ -347,7 +364,7 @@ public:
      *
      * @returns A reference to the current setting value
      */
-    const Type& operator=(const Type& val) override {
+    const Type& operator=(const Type& val) override final {
         Type temp{ranged ? std::clamp(val, this->minimum, this->maximum) : val};
         if (use_global) {
             std::swap(this->value, temp);
@@ -362,7 +379,7 @@ public:
      *
      * @returns A reference to the current setting value
      */
-    virtual explicit operator const Type&() const override {
+    explicit operator const Type&() const override final {
         if (use_global) {
             return this->value;
         }
-- 
cgit v1.2.3


From 1e093767a85ee0fdce6f1619e967a6560963dcf3 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:42:59 -0400
Subject: common,configure_system: Rename method to GetCategory

Fixes essentially a shadowing issue.
---
 src/common/settings_common.cpp              | 2 +-
 src/common/settings_common.h                | 8 ++++----
 src/common/settings_setting.h               | 4 ++--
 src/yuzu/configuration/configure_system.cpp | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 799942980..8b666f8b2 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -36,7 +36,7 @@ bool BasicSetting::RuntimeModfiable() const {
     return runtime_modifiable;
 }
 
-Category BasicSetting::Category() const {
+Category BasicSetting::GetCategory() const {
     return category;
 }
 
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index b355384a4..ca218e37b 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -196,7 +196,7 @@ public:
      *
      * @returns The setting's category
      */
-    [[nodiscard]] enum Category Category() const;
+    [[nodiscard]] Category GetCategory() const;
 
     /**
      * @returns Extra metadata for data representation in frontend implementations.
@@ -246,9 +246,9 @@ public:
     [[nodiscard]] virtual bool UsingGlobal() const;
 
 private:
-    const std::string label;      ///< The setting's label
-    const enum Category category; ///< The setting's category AKA INI group
-    const u32 id;                 ///< Unique integer for the setting
+    const std::string label; ///< The setting's label
+    const Category category; ///< The setting's category AKA INI group
+    const u32 id;            ///< Unique integer for the setting
     const bool save; ///< Suggests if the setting should be saved and read to a frontend config
     const bool
         runtime_modifiable;   ///< Suggests if the setting can be modified while a guest is running
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 959b4f3f9..55280fec4 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -40,7 +40,7 @@ public:
      * @param other_setting_ A second Setting to associate to this one in metadata
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
-                     enum Category category_, u32 specialization_ = Specialization::Default,
+                     Category category_, u32 specialization_ = Specialization::Default,
                      bool save_ = true, bool runtime_modifiable_ = false,
                      BasicSetting* other_setting_ = nullptr)
         requires(!ranged)
@@ -64,7 +64,7 @@ public:
      * @param other_setting_ A second Setting to associate to this one in metadata
      */
     explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
-                     const Type& max_val, const std::string& name, enum Category category_,
+                     const Type& max_val, const std::string& name, Category category_,
                      u32 specialization_ = Specialization::Default, bool save_ = true,
                      bool runtime_modifiable_ = false, BasicSetting* other_setting_ = nullptr)
         requires(ranged)
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 05706c4de..d76630bcb 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -124,7 +124,7 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) {
             combo_language = widget->combobox;
         }
 
-        switch (setting->Category()) {
+        switch (setting->GetCategory()) {
         case Settings::Category::Core:
             core_hold.emplace(setting->Id(), widget);
             break;
-- 
cgit v1.2.3


From b02e7eea78cf5d5f3631b11a58f28d0888948fc0 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:44:27 -0400
Subject: settings_setting: Fix typo

---
 src/common/settings_setting.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 55280fec4..a8beb06e9 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -34,7 +34,7 @@ public:
      * @param default_val Initial value of the setting, and default value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
-     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param specialization_ Suggestion for how frontend implementations represent this in a config
      * @param save_ Suggests that this should or should not be saved to a frontend config file
      * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
      * @param other_setting_ A second Setting to associate to this one in metadata
@@ -58,7 +58,7 @@ public:
      * @param max_val Sets the maximum allowed value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
-     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param specialization_ Suggestion for how frontend implementations represent this in a config
      * @param save_ Suggests that this should or should not be saved to a frontend config file
      * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
      * @param other_setting_ A second Setting to associate to this one in metadata
@@ -251,7 +251,7 @@ public:
      * @param default_val Initial value of the setting, and default value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
-     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param specialization_ Suggestion for how frontend implementations represent this in a config
      * @param save_ Suggests that this should or should not be saved to a frontend config file
      * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
      * @param other_setting_ A second Setting to associate to this one in metadata
@@ -277,7 +277,7 @@ public:
      * @param max_val Sets the maximum allowed value of the setting
      * @param name Label for the setting
      * @param category_ Category of the setting AKA INI group
-     * @param specialization_ Suggestion for how frontend implemetations represent this in a config
+     * @param specialization_ Suggestion for how frontend implementations represent this in a config
      * @param save_ Suggests that this should or should not be saved to a frontend config file
      * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded
      * @param other_setting_ A second Setting to associate to this one in metadata
-- 
cgit v1.2.3


From 32116231924bfc1ad356fc0f39df327a393b8df1 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:49:36 -0400
Subject: common: Move global configuration state modifiers back to settings

---
 src/common/settings.cpp                  | 10 ++++++++++
 src/common/settings.h                    |  3 +++
 src/common/settings_common.cpp           | 10 ----------
 src/common/settings_common.h             |  3 ---
 src/yuzu/configuration/shared_widget.cpp |  1 +
 5 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 59d24a053..4c1cd1cac 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -287,4 +287,14 @@ void RestoreGlobalState(bool is_powered_on) {
     }
 }
 
+static bool configuring_global = true;
+
+bool IsConfiguringGlobal() {
+    return configuring_global;
+}
+
+void SetConfiguringGlobal(bool is_global) {
+    configuring_global = is_global;
+}
+
 } // namespace Settings
diff --git a/src/common/settings.h b/src/common/settings.h
index 618c34334..655f6468a 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -529,4 +529,7 @@ void UpdateRescalingInfo();
 // Restore the global state of all applicable settings in the Values struct
 void RestoreGlobalState(bool is_powered_on);
 
+bool IsConfiguringGlobal();
+void SetConfiguringGlobal(bool is_global);
+
 } // namespace Settings
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 8b666f8b2..1439fb451 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -52,14 +52,4 @@ const std::string& BasicSetting::GetLabel() const {
     return label;
 }
 
-static bool configuring_global = true;
-
-bool IsConfiguringGlobal() {
-    return configuring_global;
-}
-
-void SetConfiguringGlobal(bool is_global) {
-    configuring_global = is_global;
-}
-
 } // namespace Settings
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index ca218e37b..a7630a97f 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -60,9 +60,6 @@ enum Specialization : u8 {
     Percentage = (1 << SpecializationAttributeOffset),
 };
 
-bool IsConfiguringGlobal();
-void SetConfiguringGlobal(bool is_global);
-
 class BasicSetting;
 
 class Linkage {
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index ba7f60c2d..c9ab461f6 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -39,6 +39,7 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
+#include "common/settings.h"
 #include "common/settings_common.h"
 #include "yuzu/configuration/shared_translation.h"
 
-- 
cgit v1.2.3


From ffb384463f1f12264dbd8ad8827a8b42115921aa Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 19 Jul 2023 13:45:50 -0400
Subject: settings: Remove sorting from log

Unecessary, and would run every time the settings are logged.
---
 src/common/settings.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 4c1cd1cac..0e2ccf857 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -108,10 +108,6 @@ void LogSettings() {
 
     LOG_INFO(Config, "yuzu Configuration:");
     for (auto& [category, settings] : values.linkage.by_category) {
-        settings.sort([](const BasicSetting* a, const BasicSetting* b) {
-            return a->GetLabel() < b->GetLabel();
-        });
-
         for (const auto& setting : settings) {
             if (setting->Id() == values.yuzu_token.Id()) {
                 // Hide the token secret, for security reasons.
-- 
cgit v1.2.3


From 2911988b852ec29016780aabb1f46e2d0c231744 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 19 Jul 2023 13:46:48 -0400
Subject: settings_common: Use a vector in category linkage

Improve storage requirements.
---
 src/common/settings_common.cpp | 2 +-
 src/common/settings_common.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 1439fb451..90842e797 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -12,7 +12,7 @@ BasicSetting::BasicSetting(Linkage& linkage, const std::string& name, enum Categ
     : label{name}, category{category_}, id{linkage.count}, save{save_},
       runtime_modifiable{runtime_modifiable_}, specialization{specialization_},
       other_setting{other_setting_} {
-    linkage.by_category[category].push_front(this);
+    linkage.by_category[category].push_back(this);
     linkage.count++;
 }
 
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index a7630a97f..bfd1bad64 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -66,7 +66,7 @@ class Linkage {
 public:
     explicit Linkage(u32 initial_count = 0);
     ~Linkage();
-    std::map<Category, std::forward_list<BasicSetting*>> by_category{};
+    std::map<Category, std::vector<BasicSetting*>> by_category{};
     std::vector<std::function<void()>> restore_functions{};
     u32 count;
 };
-- 
cgit v1.2.3


From 17b9c1e1715a16bebcdd92c02ce7f7e503212462 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Fri, 21 Jul 2023 23:09:09 -0400
Subject: common,qt-config: Remove usage of forward_list

---
 src/common/settings.cpp                              |  1 -
 src/common/settings_common.h                         |  1 -
 src/yuzu/configuration/configuration_shared.cpp      |  5 +++--
 src/yuzu/configuration/configuration_shared.h        |  4 ++--
 src/yuzu/configuration/configure_audio.cpp           |  8 ++++----
 src/yuzu/configuration/configure_audio.h             |  6 +++---
 src/yuzu/configuration/configure_cpu.cpp             |  8 ++++----
 src/yuzu/configuration/configure_cpu.h               |  5 +++--
 src/yuzu/configuration/configure_dialog.h            |  3 +--
 src/yuzu/configuration/configure_general.cpp         |  8 ++++----
 src/yuzu/configuration/configure_general.h           |  5 +++--
 src/yuzu/configuration/configure_graphics.cpp        | 20 ++++++++++----------
 src/yuzu/configuration/configure_graphics.h          |  4 ++--
 .../configuration/configure_graphics_advanced.cpp    |  4 ++--
 src/yuzu/configuration/configure_graphics_advanced.h |  6 +++---
 src/yuzu/configuration/configure_per_game.cpp        |  2 +-
 src/yuzu/configuration/configure_per_game.h          |  3 +--
 src/yuzu/configuration/configure_system.cpp          | 12 ++++++------
 src/yuzu/configuration/configure_system.h            |  6 +++---
 src/yuzu/configuration/shared_widget.cpp             |  8 ++++----
 src/yuzu/configuration/shared_widget.h               | 10 +++++-----
 21 files changed, 64 insertions(+), 65 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 0e2ccf857..4a4ba307c 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -10,7 +10,6 @@
 #include <compare>
 #include <cstddef>
 #include <filesystem>
-#include <forward_list>
 #include <functional>
 #include <string_view>
 #include <type_traits>
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index bfd1bad64..6f90ae90d 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <forward_list>
 #include <functional>
 #include <map>
 #include <string>
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 8c12d063e..0ed6146a0 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -3,13 +3,14 @@
 
 #include <memory>
 #include <type_traits>
+#include <vector>
 #include "yuzu/configuration/configuration_shared.h"
 
 namespace ConfigurationShared {
 
-Tab::Tab(std::shared_ptr<std::forward_list<Tab*>> group, QWidget* parent) : QWidget(parent) {
+Tab::Tab(std::shared_ptr<std::vector<Tab*>> group, QWidget* parent) : QWidget(parent) {
     if (group != nullptr) {
-        group->push_front(this);
+        group->push_back(this);
     }
 }
 
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 2a084b584..31897a6b0 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <forward_list>
 #include <memory>
+#include <vector>
 #include <QString>
 #include <QWidget>
 #include <qobjectdefs.h>
@@ -17,7 +17,7 @@ class Tab : public QWidget {
     Q_OBJECT
 
 public:
-    explicit Tab(std::shared_ptr<std::forward_list<Tab*>> group, QWidget* parent = nullptr);
+    explicit Tab(std::shared_ptr<std::vector<Tab*>> group, QWidget* parent = nullptr);
     ~Tab();
 
     virtual void ApplyConfiguration() = 0;
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 11714b86d..7eb752898 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <forward_list>
 #include <memory>
+#include <vector>
 #include <QComboBox>
 
 #include "audio_core/sink/sink.h"
@@ -17,7 +17,7 @@
 #include "yuzu/uisettings.h"
 
 ConfigureAudio::ConfigureAudio(const Core::System& system_,
-                               std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
+                               std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
                                const ConfigurationShared::Builder& builder, QWidget* parent)
     : Tab(group_, parent), ui(std::make_unique<Ui::ConfigureAudio>()), system{system_} {
     ui->setupUi(this);
@@ -31,11 +31,11 @@ ConfigureAudio::~ConfigureAudio() = default;
 void ConfigureAudio::Setup(const ConfigurationShared::Builder& builder) {
     auto& layout = *ui->audio_widget->layout();
 
-    std::forward_list<Settings::BasicSetting*> settings;
+    std::vector<Settings::BasicSetting*> settings;
 
     auto push = [&](Settings::Category category) {
         for (auto* setting : Settings::values.linkage.by_category[category]) {
-            settings.push_front(setting);
+            settings.push_back(setting);
         }
     };
 
diff --git a/src/yuzu/configuration/configure_audio.h b/src/yuzu/configuration/configure_audio.h
index 94606f210..79538e81c 100644
--- a/src/yuzu/configuration/configure_audio.h
+++ b/src/yuzu/configuration/configure_audio.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <forward_list>
 #include <functional>
 #include <memory>
+#include <vector>
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
 
@@ -26,7 +26,7 @@ class Builder;
 class ConfigureAudio : public ConfigurationShared::Tab {
 public:
     explicit ConfigureAudio(const Core::System& system_,
-                            std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                            std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
                             const ConfigurationShared::Builder& builder, QWidget* parent = nullptr);
     ~ConfigureAudio() override;
 
@@ -51,7 +51,7 @@ private:
 
     const Core::System& system;
 
-    std::forward_list<std::function<void(bool)>> apply_funcs{};
+    std::vector<std::function<void(bool)>> apply_funcs{};
 
     QComboBox* sink_combo_box;
     QComboBox* output_device_combo_box;
diff --git a/src/yuzu/configuration/configure_cpu.cpp b/src/yuzu/configuration/configure_cpu.cpp
index 7d122906e..8ed9a65f3 100644
--- a/src/yuzu/configuration/configure_cpu.cpp
+++ b/src/yuzu/configuration/configure_cpu.cpp
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <forward_list>
 #include <memory>
 #include <typeinfo>
+#include <vector>
 #include <QComboBox>
 #include "common/common_types.h"
 #include "common/settings.h"
@@ -15,7 +15,7 @@
 #include "yuzu/configuration/configure_cpu.h"
 
 ConfigureCpu::ConfigureCpu(const Core::System& system_,
-                           std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
+                           std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
                            const ConfigurationShared::Builder& builder, QWidget* parent)
     : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureCpu>()}, system{system_},
       combobox_translations(builder.ComboboxTranslations()) {
@@ -37,10 +37,10 @@ void ConfigureCpu::Setup(const ConfigurationShared::Builder& builder) {
     auto* unsafe_layout = ui->unsafe_widget->layout();
     std::map<std::string, QWidget*> unsafe_hold{};
 
-    std::forward_list<Settings::BasicSetting*> settings;
+    std::vector<Settings::BasicSetting*> settings;
     const auto push = [&](Settings::Category category) {
         for (const auto setting : Settings::values.linkage.by_category[category]) {
-            settings.push_front(setting);
+            settings.push_back(setting);
         }
     };
 
diff --git a/src/yuzu/configuration/configure_cpu.h b/src/yuzu/configuration/configure_cpu.h
index ab19c0ba1..61a6de7aa 100644
--- a/src/yuzu/configuration/configure_cpu.h
+++ b/src/yuzu/configuration/configure_cpu.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/shared_translation.h"
@@ -25,7 +26,7 @@ class Builder;
 class ConfigureCpu : public ConfigurationShared::Tab {
 public:
     explicit ConfigureCpu(const Core::System& system_,
-                          std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                          std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
                           const ConfigurationShared::Builder& builder, QWidget* parent = nullptr);
     ~ConfigureCpu() override;
 
@@ -45,7 +46,7 @@ private:
     const Core::System& system;
 
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations;
-    std::forward_list<std::function<void(bool)>> apply_funcs{};
+    std::vector<std::function<void(bool)>> apply_funcs{};
 
     QComboBox* accuracy_combobox;
 };
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index 1bfc9f9d0..96e9a8c3e 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <forward_list>
 #include <memory>
 #include <vector>
 #include <QDialog>
@@ -74,7 +73,7 @@ private:
 
     Core::System& system;
     std::unique_ptr<ConfigurationShared::Builder> builder;
-    std::forward_list<ConfigurationShared::Tab*> tab_group;
+    std::vector<ConfigurationShared::Tab*> tab_group;
 
     std::unique_ptr<ConfigureAudio> audio_tab;
     std::unique_ptr<ConfigureCpu> cpu_tab;
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 54113543a..fc43a531d 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -3,6 +3,7 @@
 
 #include <functional>
 #include <utility>
+#include <vector>
 #include <QMessageBox>
 #include "common/settings.h"
 #include "core/core.h"
@@ -12,10 +13,9 @@
 #include "yuzu/configuration/shared_widget.h"
 #include "yuzu/uisettings.h"
 
-ConfigureGeneral::ConfigureGeneral(
-    const Core::System& system_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
-    const ConfigurationShared::Builder& builder, QWidget* parent)
+ConfigureGeneral::ConfigureGeneral(const Core::System& system_,
+                                   std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
+                                   const ConfigurationShared::Builder& builder, QWidget* parent)
     : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureGeneral>()}, system{system_} {
     ui->setupUi(this);
 
diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h
index f8ed3f8ab..2d953f679 100644
--- a/src/yuzu/configuration/configure_general.h
+++ b/src/yuzu/configuration/configure_general.h
@@ -5,6 +5,7 @@
 
 #include <functional>
 #include <memory>
+#include <vector>
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
 
@@ -26,7 +27,7 @@ class Builder;
 class ConfigureGeneral : public ConfigurationShared::Tab {
 public:
     explicit ConfigureGeneral(const Core::System& system_,
-                              std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                              std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
                               const ConfigurationShared::Builder& builder,
                               QWidget* parent = nullptr);
     ~ConfigureGeneral() override;
@@ -46,7 +47,7 @@ private:
 
     std::unique_ptr<Ui::ConfigureGeneral> ui;
 
-    std::forward_list<std::function<void(bool)>> apply_funcs{};
+    std::vector<std::function<void(bool)>> apply_funcs{};
 
     const Core::System& system;
 };
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 31e87ccf5..a6f711597 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -77,11 +77,11 @@ static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode)
     }
 }
 
-ConfigureGraphics::ConfigureGraphics(
-    const Core::System& system_, std::vector<VkDeviceInfo::Record>& records_,
-    const std::function<void()>& expose_compute_option_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
-    const ConfigurationShared::Builder& builder, QWidget* parent)
+ConfigureGraphics::ConfigureGraphics(const Core::System& system_,
+                                     std::vector<VkDeviceInfo::Record>& records_,
+                                     const std::function<void()>& expose_compute_option_,
+                                     std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
+                                     const ConfigurationShared::Builder& builder, QWidget* parent)
     : ConfigurationShared::Tab(group_, parent), ui{std::make_unique<Ui::ConfigureGraphics>()},
       records{records_}, expose_compute_option{expose_compute_option_}, system{system_},
       combobox_translations{builder.ComboboxTranslations()},
@@ -228,7 +228,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
     QLayout& graphics_layout = *ui->graphics_widget->layout();
 
     std::map<u32, QWidget*> hold_graphics;
-    std::forward_list<QWidget*> hold_api;
+    std::vector<QWidget*> hold_api;
 
     for (const auto setting : Settings::values.linkage.by_category[Settings::Category::Renderer]) {
         ConfigurationShared::Widget* widget = [&]() {
@@ -268,12 +268,12 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
             }
         } else if (setting->Id() == Settings::values.vulkan_device.Id()) {
             // Keep track of vulkan_device's combobox so we can populate it
-            hold_api.push_front(widget);
+            hold_api.push_back(widget);
             vulkan_device_combobox = widget->combobox;
             vulkan_device_widget = widget;
         } else if (setting->Id() == Settings::values.shader_backend.Id()) {
             // Keep track of shader_backend's combobox so we can populate it
-            hold_api.push_front(widget);
+            hold_api.push_back(widget);
             shader_backend_combobox = widget->combobox;
             shader_backend_widget = widget;
         } else if (setting->Id() == Settings::values.vsync_mode.Id()) {
@@ -296,7 +296,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
     // Background color is too specific to build into the new system, so we manage it here
     // (3 settings, all collected into a single widget with a QColor to manage on top)
     if (Settings::IsConfiguringGlobal()) {
-        apply_funcs.push_front([this](bool powered_on) {
+        apply_funcs.push_back([this](bool powered_on) {
             Settings::values.bg_red.SetValue(static_cast<u8>(bg_color.red()));
             Settings::values.bg_green.SetValue(static_cast<u8>(bg_color.green()));
             Settings::values.bg_blue.SetValue(static_cast<u8>(bg_color.blue()));
@@ -322,7 +322,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
             bg_restore_button->setEnabled(true);
         });
 
-        apply_funcs.push_front([bg_restore_button, this](bool powered_on) {
+        apply_funcs.push_back([bg_restore_button, this](bool powered_on) {
             const bool using_global = !bg_restore_button->isEnabled();
             Settings::values.bg_red.SetGlobal(using_global);
             Settings::values.bg_green.SetGlobal(using_global);
diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h
index 633a28414..02d9b00f1 100644
--- a/src/yuzu/configuration/configure_graphics.h
+++ b/src/yuzu/configuration/configure_graphics.h
@@ -46,7 +46,7 @@ public:
     explicit ConfigureGraphics(const Core::System& system_,
                                std::vector<VkDeviceInfo::Record>& records,
                                const std::function<void()>& expose_compute_option_,
-                               std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                               std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
                                const ConfigurationShared::Builder& builder,
                                QWidget* parent = nullptr);
     ~ConfigureGraphics() override;
@@ -80,7 +80,7 @@ private:
     std::unique_ptr<Ui::ConfigureGraphics> ui;
     QColor bg_color;
 
-    std::forward_list<std::function<void(bool)>> apply_funcs{};
+    std::vector<std::function<void(bool)>> apply_funcs{};
 
     std::vector<VkDeviceInfo::Record>& records;
     std::vector<QString> vulkan_devices;
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 757e4659d..f60214ff9 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <vector>
 #include <QLabel>
 #include <qnamespace.h>
 #include "common/settings.h"
@@ -12,8 +13,7 @@
 #include "yuzu/configuration/shared_widget.h"
 
 ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(
-    const Core::System& system_,
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
+    const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
     const ConfigurationShared::Builder& builder, QWidget* parent)
     : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureGraphicsAdvanced>()}, system{system_} {
 
diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h
index 5530827d1..78b5389c3 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.h
+++ b/src/yuzu/configuration/configure_graphics_advanced.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
 
@@ -22,8 +23,7 @@ class Builder;
 class ConfigureGraphicsAdvanced : public ConfigurationShared::Tab {
 public:
     explicit ConfigureGraphicsAdvanced(
-        const Core::System& system_,
-        std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+        const Core::System& system_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
         const ConfigurationShared::Builder& builder, QWidget* parent = nullptr);
     ~ConfigureGraphicsAdvanced() override;
 
@@ -41,7 +41,7 @@ private:
 
     const Core::System& system;
 
-    std::forward_list<std::function<void(bool)>> apply_funcs;
+    std::vector<std::function<void(bool)>> apply_funcs;
 
     QWidget* checkbox_enable_compute_pipelines{};
 };
diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index cee8e726d..cd8b3012e 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -44,7 +44,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
     : QDialog(parent),
       ui(std::make_unique<Ui::ConfigurePerGame>()), title_id{title_id_}, system{system_},
       builder{std::make_unique<ConfigurationShared::Builder>(this, !system_.IsPoweredOn())},
-      tab_group{std::make_shared<std::forward_list<ConfigurationShared::Tab*>>()} {
+      tab_group{std::make_shared<std::vector<ConfigurationShared::Tab*>>()} {
     const auto file_path = std::filesystem::path(Common::FS::ToU8String(file_name));
     const auto config_file_name = title_id == 0 ? Common::FS::PathToUTF8String(file_path.filename())
                                                 : fmt::format("{:016X}", title_id);
diff --git a/src/yuzu/configuration/configure_per_game.h b/src/yuzu/configuration/configure_per_game.h
index 4ddd18c1f..1a727f32c 100644
--- a/src/yuzu/configuration/configure_per_game.h
+++ b/src/yuzu/configuration/configure_per_game.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <forward_list>
 #include <memory>
 #include <string>
 #include <vector>
@@ -77,7 +76,7 @@ private:
 
     Core::System& system;
     std::unique_ptr<ConfigurationShared::Builder> builder;
-    std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> tab_group;
+    std::shared_ptr<std::vector<ConfigurationShared::Tab*>> tab_group;
 
     std::unique_ptr<ConfigurePerGameAddons> addons_tab;
     std::unique_ptr<ConfigureAudio> audio_tab;
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 7884886c3..93a0a4102 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <chrono>
-#include <forward_list>
 #include <optional>
+#include <vector>
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -44,9 +44,9 @@ static bool IsValidLocale(u32 region_index, u32 language_index) {
     return ((LOCALE_BLOCKLIST.at(region_index) >> language_index) & 1) == 0;
 }
 
-ConfigureSystem::ConfigureSystem(
-    Core::System& system_, std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group_,
-    const ConfigurationShared::Builder& builder, QWidget* parent)
+ConfigureSystem::ConfigureSystem(Core::System& system_,
+                                 std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
+                                 const ConfigurationShared::Builder& builder, QWidget* parent)
     : Tab(group_, parent), ui{std::make_unique<Ui::ConfigureSystem>()}, system{system_} {
     ui->setupUi(this);
 
@@ -95,10 +95,10 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) {
     std::map<u32, QWidget*> core_hold{};
     std::map<u32, QWidget*> system_hold{};
 
-    std::forward_list<Settings::BasicSetting*> settings;
+    std::vector<Settings::BasicSetting*> settings;
     auto push = [&settings](auto& list) {
         for (auto setting : list) {
-            settings.push_front(setting);
+            settings.push_back(setting);
         }
     };
 
diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index f63aedda0..eab99a48a 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <forward_list>
 #include <functional>
 #include <memory>
+#include <vector>
 
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
@@ -29,7 +29,7 @@ class Builder;
 class ConfigureSystem : public ConfigurationShared::Tab {
 public:
     explicit ConfigureSystem(Core::System& system_,
-                             std::shared_ptr<std::forward_list<ConfigurationShared::Tab*>> group,
+                             std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
                              const ConfigurationShared::Builder& builder,
                              QWidget* parent = nullptr);
     ~ConfigureSystem() override;
@@ -43,7 +43,7 @@ private:
 
     void Setup(const ConfigurationShared::Builder& builder);
 
-    std::forward_list<std::function<void(bool)>> apply_funcs{};
+    std::vector<std::function<void(bool)>> apply_funcs{};
 
     std::unique_ptr<Ui::ConfigureSystem> ui;
     bool enabled = false;
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index c9ab461f6..cf33bce2b 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -547,7 +547,7 @@ Widget::~Widget() = default;
 
 Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translations_,
                const ComboboxTranslationMap& combobox_translations_, QWidget* parent_,
-               bool runtime_lock_, std::forward_list<std::function<void(bool)>>& apply_funcs_,
+               bool runtime_lock_, std::vector<std::function<void(bool)>>& apply_funcs_,
                RequestType request, bool managed, float multiplier,
                Settings::BasicSetting* other_setting, const QString& suffix)
     : QWidget(parent_), parent{parent_}, translations{translations_},
@@ -584,7 +584,7 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
         return;
     }
 
-    apply_funcs.push_front([load_func, setting_](bool powered_on) {
+    apply_funcs.push_back([load_func, setting_](bool powered_on) {
         if (setting_->RuntimeModfiable() || !powered_on) {
             load_func();
         }
@@ -607,7 +607,7 @@ Builder::Builder(QWidget* parent_, bool runtime_lock_)
 Builder::~Builder() = default;
 
 Widget* Builder::BuildWidget(Settings::BasicSetting* setting,
-                             std::forward_list<std::function<void(bool)>>& apply_funcs,
+                             std::vector<std::function<void(bool)>>& apply_funcs,
                              RequestType request, bool managed, float multiplier,
                              Settings::BasicSetting* other_setting, const QString& suffix) const {
     if (!Settings::IsConfiguringGlobal() && !setting->Switchable()) {
@@ -624,7 +624,7 @@ Widget* Builder::BuildWidget(Settings::BasicSetting* setting,
 }
 
 Widget* Builder::BuildWidget(Settings::BasicSetting* setting,
-                             std::forward_list<std::function<void(bool)>>& apply_funcs,
+                             std::vector<std::function<void(bool)>>& apply_funcs,
                              Settings::BasicSetting* other_setting, RequestType request,
                              const QString& suffix) const {
     return BuildWidget(setting, apply_funcs, request, true, 1.0f, other_setting, suffix);
diff --git a/src/yuzu/configuration/shared_widget.h b/src/yuzu/configuration/shared_widget.h
index b3f9efd78..e64693bab 100644
--- a/src/yuzu/configuration/shared_widget.h
+++ b/src/yuzu/configuration/shared_widget.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <forward_list>
 #include <functional>
 #include <memory>
 #include <string>
+#include <vector>
 #include <QString>
 #include <QStringLiteral>
 #include <QWidget>
@@ -62,7 +62,7 @@ public:
      */
     explicit Widget(Settings::BasicSetting* setting, const TranslationMap& translations,
                     const ComboboxTranslationMap& combobox_translations, QWidget* parent,
-                    bool runtime_lock, std::forward_list<std::function<void(bool)>>& apply_funcs_,
+                    bool runtime_lock, std::vector<std::function<void(bool)>>& apply_funcs_,
                     RequestType request = RequestType::Default, bool managed = true,
                     float multiplier = 1.0f, Settings::BasicSetting* other_setting = nullptr,
                     const QString& suffix = QStringLiteral(""));
@@ -125,7 +125,7 @@ private:
     const TranslationMap& translations;
     const ComboboxTranslationMap& combobox_enumerations;
     Settings::BasicSetting& setting;
-    std::forward_list<std::function<void(bool)>>& apply_funcs;
+    std::vector<std::function<void(bool)>>& apply_funcs;
 
     bool created{false};
     bool runtime_lock{false};
@@ -137,13 +137,13 @@ public:
     ~Builder();
 
     Widget* BuildWidget(Settings::BasicSetting* setting,
-                        std::forward_list<std::function<void(bool)>>& apply_funcs,
+                        std::vector<std::function<void(bool)>>& apply_funcs,
                         RequestType request = RequestType::Default, bool managed = true,
                         float multiplier = 1.0f, Settings::BasicSetting* other_setting = nullptr,
                         const QString& suffix = QStringLiteral("")) const;
 
     Widget* BuildWidget(Settings::BasicSetting* setting,
-                        std::forward_list<std::function<void(bool)>>& apply_funcs,
+                        std::vector<std::function<void(bool)>>& apply_funcs,
                         Settings::BasicSetting* other_setting,
                         RequestType request = RequestType::Default,
                         const QString& suffix = QStringLiteral("")) const;
-- 
cgit v1.2.3


From f84e7b4656f1e69cced4e58117df920efaec922e Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sun, 23 Jul 2023 16:21:08 -0400
Subject: settings_common: Document specializations

---
 src/common/settings_common.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 6f90ae90d..2efb329b0 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -46,17 +46,18 @@ constexpr u8 SpecializationTypeMask = 0xf;
 constexpr u8 SpecializationAttributeMask = 0xf0;
 constexpr u8 SpecializationAttributeOffset = 4;
 
+// Scalar and countable could have better names
 enum Specialization : u8 {
     Default = 0,
-    Time = 1,
-    Hex = 2,
-    List = 3,
-    RuntimeList = 4,
-    Scalar = 5,
-    Countable = 6,
-    Paired = 7,
-
-    Percentage = (1 << SpecializationAttributeOffset),
+    Time = 1,        // Duration or specific moment in time
+    Hex = 2,         // Hexadecimal number
+    List = 3,        // Setting has specific members
+    RuntimeList = 4, // Members of the list are determined during runtime
+    Scalar = 5,      // Values are continuous
+    Countable = 6,   // Can be stepped through
+    Paired = 7,      // Another setting is associated with this setting
+
+    Percentage = (1 << SpecializationAttributeOffset), // Should be represented as a percentage
 };
 
 class BasicSetting;
-- 
cgit v1.2.3


From b1716a9e147f744dfe4bd977f4a5af12f3a2ec0f Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 24 Jul 2023 16:28:13 -0400
Subject: settings: Set GPU as default ASTC decoder

---
 src/common/settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 655f6468a..43ebeae9e 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -226,7 +226,7 @@ struct Values {
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{
         linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
     SwitchableSetting<AstcDecodeMode, true> accelerate_astc{linkage,
-                                                            AstcDecodeMode::Cpu,
+                                                            AstcDecodeMode::Gpu,
                                                             AstcDecodeMode::Cpu,
                                                             AstcDecodeMode::CpuAsynchronous,
                                                             "accelerate_astc",
-- 
cgit v1.2.3


From 397333b2d51fc93c1285465f43668fb86e709fc3 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:57:55 -0400
Subject: settings: Correct Linkage member impl location

---
 src/common/settings.cpp        | 3 ---
 src/common/settings_common.cpp | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 4a4ba307c..491adc30e 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -151,9 +151,6 @@ float Volume() {
     return values.volume.GetValue() / static_cast<f32>(values.volume.GetDefault());
 }
 
-Linkage::Linkage(u32 initial_count) : count{initial_count} {}
-Linkage::~Linkage() = default;
-
 const char* TranslateCategory(Category category) {
     switch (category) {
     case Category::Audio:
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 90842e797..dedf5ef90 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -52,4 +52,7 @@ const std::string& BasicSetting::GetLabel() const {
     return label;
 }
 
+Linkage::Linkage(u32 initial_count) : count{initial_count} {}
+Linkage::~Linkage() = default;
+
 } // namespace Settings
-- 
cgit v1.2.3


From 1bc0b673aa2fc0510d332286e49f6c8d44568065 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 25 Jul 2023 22:31:21 -0400
Subject: backend: Remove usage of explicit operator overload

Causes a crash on MSVC from a race condition on application quit.

Intended to address yuzu-emu/yuzu/issues/11137
---
 src/common/logging/backend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 6e8e8eb36..d4f27197c 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -108,7 +108,7 @@ public:
 
         using namespace Common::Literals;
         // Prevent logs from exceeding a set maximum size in the event that log entries are spammed.
-        const auto write_limit = Settings::values.extended_logging ? 1_GiB : 100_MiB;
+        const auto write_limit = Settings::values.extended_logging.GetValue() ? 1_GiB : 100_MiB;
         const bool write_limit_exceeded = bytes_written > write_limit;
         if (entry.log_level >= Level::Error || write_limit_exceeded) {
             if (write_limit_exceeded) {
-- 
cgit v1.2.3


From 195403c87cf17e91c686fc98c27429d23974af73 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:13:54 -0400
Subject: (ui)settings: Add more runtime_modifiable settings

---
 src/common/settings.h |  9 +++++----
 src/yuzu/uisettings.h | 29 +++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 10 deletions(-)

(limited to 'src/common')

diff --git a/src/common/settings.h b/src/common/settings.h
index 43ebeae9e..b0bc6519a 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -134,9 +134,10 @@ struct Values {
                                                 Specialization::RuntimeList};
     Setting<std::string> audio_input_device_id{linkage, "auto", "input_device", Category::Audio,
                                                Specialization::RuntimeList};
-    SwitchableSetting<AudioMode, true> sound_index{linkage,         AudioMode::Stereo,
-                                                   AudioMode::Mono, AudioMode::Surround,
-                                                   "sound_index",   Category::SystemAudio};
+    SwitchableSetting<AudioMode, true> sound_index{
+        linkage,       AudioMode::Stereo,     AudioMode::Mono,         AudioMode::Surround,
+        "sound_index", Category::SystemAudio, Specialization::Default, true,
+        true};
     SwitchableSetting<u8, true> volume{linkage,
                                        100,
                                        0,
@@ -147,7 +148,7 @@ struct Values {
                                        true,
                                        true};
     Setting<bool, false> audio_muted{
-        linkage, false, "audio_muted", Category::Audio, Specialization::Default, false};
+        linkage, false, "audio_muted", Category::Audio, Specialization::Default, false, true};
     Setting<bool, false> dump_audio_commands{
         linkage, false, "dump_audio_commands", Category::Audio, Specialization::Default, false};
 
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index ee8c9f214..c9c89cee4 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -90,18 +90,35 @@ struct Values {
     Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};
     Setting<bool> show_status_bar{linkage, true, "showStatusBar", Category::Ui};
 
-    Setting<bool> confirm_before_closing{linkage, true, "confirmClose", Category::UiGeneral};
+    Setting<bool> confirm_before_closing{
+        linkage, true, "confirmClose", Category::UiGeneral, Settings::Specialization::Default,
+        true,    true};
     Setting<bool> first_start{linkage, true, "firstStart", Category::Ui};
-    Setting<bool> pause_when_in_background{linkage, false, "pauseWhenInBackground",
-                                           Category::UiGeneral};
-    Setting<bool> mute_when_in_background{linkage, false, "muteWhenInBackground", Category::Ui};
-    Setting<bool> hide_mouse{linkage, true, "hideInactiveMouse", Category::UiGeneral};
+    Setting<bool> pause_when_in_background{linkage,
+                                           false,
+                                           "pauseWhenInBackground",
+                                           Category::UiGeneral,
+                                           Settings::Specialization::Default,
+                                           true,
+                                           true};
+    Setting<bool> mute_when_in_background{
+        linkage, false, "muteWhenInBackground", Category::Ui, Settings::Specialization::Default,
+        true,    true};
+    Setting<bool> hide_mouse{
+        linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default,
+        true,    true};
     Setting<bool> controller_applet_disabled{linkage, false, "disableControllerApplet",
                                              Category::UiGeneral};
     // Set when Vulkan is known to crash the application
     bool has_broken_vulkan = false;
 
-    Setting<bool> select_user_on_boot{linkage, false, "select_user_on_boot", Category::UiGeneral};
+    Setting<bool> select_user_on_boot{linkage,
+                                      false,
+                                      "select_user_on_boot",
+                                      Category::UiGeneral,
+                                      Settings::Specialization::Default,
+                                      true,
+                                      true};
     Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Ui};
 
     // Discord RPC
-- 
cgit v1.2.3