settings: default to ScaleForce and FXAA

Include both filters in the accepted MKW preset and verify defaults and saved-preference overrides.

Assisted by Codex.

4 files changed, 17 insertions, 3 deletions

diff --git a/src/common/game_presets.h b/src/common/game_presets.h
index f8299d948f..83dd4d3c3f 100644
--- a/src/common/game_presets.h
+++ b/src/common/game_presets.h
@@ -22,6 +22,8 @@ inline void SetMarioKartWorldRecommendedSettings(Values& settings, bool global)
     session(settings.use_reactive_flushing, false);
     session(settings.vsync_mode, VSyncMode::FifoRelaxed);
     session(settings.use_docked_mode, ConsoleMode::Handheld);
+    session(settings.scaling_filter, ScalingFilter::ScaleForce);
+    session(settings.anti_aliasing, AntiAliasing::Fxaa);
 }
 
 inline bool ApplyMarioKartWorldPreset(Values& settings, u64 program_id, bool accepted) {
diff --git a/src/common/settings.h b/src/common/settings.h
index f253deb64b..6669f98f4c 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -358,7 +358,7 @@ struct Values {
                                                   true};
 
     SwitchableSetting<ScalingFilter> scaling_filter{linkage,
-                                                    ScalingFilter::NearestNeighbor,
+                                                    ScalingFilter::ScaleForce,
                                                     "scaling_filter",
                                                     Category::Renderer,
                                                     Specialization::Default,
@@ -387,7 +387,7 @@ struct Values {
                                                       true};
 
     SwitchableSetting<AntiAliasing> anti_aliasing{linkage,
-                                                  AntiAliasing::None,
+                                                  AntiAliasing::Fxaa,
                                                   "anti_aliasing",
                                                   Category::Renderer,
                                                   Specialization::Default,
diff --git a/src/tests/common/game_presets.cpp b/src/tests/common/game_presets.cpp
index c036895ab8..481f5c5e1d 100644
--- a/src/tests/common/game_presets.cpp
+++ b/src/tests/common/game_presets.cpp
@@ -18,6 +18,8 @@ void SetConflictingPreferences(Settings::Values& settings, bool per_game) {
     set(settings.vram_usage_mode, Settings::VramUsageMode::Aggressive);
     set(settings.use_reactive_flushing, true);
     set(settings.vsync_mode, Settings::VSyncMode::Immediate);
+    set(settings.scaling_filter, Settings::ScalingFilter::NearestNeighbor);
+    set(settings.anti_aliasing, Settings::AntiAliasing::Smaa);
 }
 
 void CheckPreset(const Settings::Values& settings) {
@@ -30,6 +32,8 @@ void CheckPreset(const Settings::Values& settings) {
     CHECK_FALSE(settings.use_reactive_flushing.GetValue());
     CHECK(settings.vsync_mode.GetValue() == Settings::VSyncMode::FifoRelaxed);
     CHECK(settings.use_docked_mode.GetValue() == Settings::ConsoleMode::Handheld);
+    CHECK(settings.scaling_filter.GetValue() == Settings::ScalingFilter::ScaleForce);
+    CHECK(settings.anti_aliasing.GetValue() == Settings::AntiAliasing::Fxaa);
 }
 
 void CheckPreferences(const Settings::Values& settings, bool global = false) {
@@ -42,9 +46,17 @@ void CheckPreferences(const Settings::Values& settings, bool global = false) {
     CHECK(settings.vram_usage_mode.GetValue(global) == Settings::VramUsageMode::Aggressive);
     CHECK(settings.use_reactive_flushing.GetValue(global));
     CHECK(settings.vsync_mode.GetValue(global) == Settings::VSyncMode::Immediate);
+    CHECK(settings.scaling_filter.GetValue(global) == Settings::ScalingFilter::NearestNeighbor);
+    CHECK(settings.anti_aliasing.GetValue(global) == Settings::AntiAliasing::Smaa);
 }
 } // namespace
 
+TEST_CASE("Display filter defaults use ScaleForce and FXAA", "[game_presets]") {
+    auto settings = std::make_unique<Settings::Values>();
+    CHECK(settings->scaling_filter.GetDefault() == Settings::ScalingFilter::ScaleForce);
+    CHECK(settings->anti_aliasing.GetDefault() == Settings::AntiAliasing::Fxaa);
+}
+
 TEST_CASE("Accepted MKW settings replace visible global preferences", "[game_presets]") {
     auto settings = std::make_unique<Settings::Values>();
     SetConflictingPreferences(*settings, false);
diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp
index d0cd130f6f..91afcd56ae 100644
--- a/src/yuzu/main_window.cpp
+++ b/src/yuzu/main_window.cpp
@@ -462,7 +462,7 @@ MainWindow::MainWindow(bool has_broken_vulkan)
         QMessageBox::Question, tr("Recommended Mario Kart World settings"),
         tr("Use the recommended settings for Mario Kart World?\n\n"
            "Vulkan, 1x resolution, GPU Fast, asynchronous shaders, BC3, conservative VRAM, "
-           "reactive flushing off, FIFO Relaxed VSync, and handheld mode.\n\n"
+           "reactive flushing off, FIFO Relaxed VSync, handheld mode, ScaleForce, and FXAA.\n\n"
            "Yes replaces your saved settings. No or closing this window keeps your settings."),
         QMessageBox::Yes | QMessageBox::No, this);
     recommendations->setAttribute(Qt::WA_DeleteOnClose);