From c76163b611350e2261a6a64f1853626af6f57ada Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Thu, 18 Nov 2021 23:04:06 -0500
Subject: main: Shorten AMD FSR status bar text

AMD'S FIDELITYFX SR -> FSR
---
 src/yuzu/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/yuzu/main.cpp')

diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 6071a222f..689746028 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3106,7 +3106,7 @@ void GMainWindow::UpdateFilterText() {
         filter_status_button->setText(tr("SCALEFORCE"));
         break;
     case Settings::ScalingFilter::Fsr:
-        filter_status_button->setText(tr("AMD'S FIDELITYFX SR"));
+        filter_status_button->setText(tr("FSR"));
         break;
     default:
         filter_status_button->setText(tr("BILINEAR"));
-- 
cgit v1.2.3


From bc5ed1aa1b41b9960657dddee658c3ce344cb501 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Thu, 18 Nov 2021 23:22:32 -0500
Subject: main: Fix default AA name

By default, no AA is applied, not FXAA
---
 src/yuzu/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/yuzu/main.cpp')

diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 689746028..44800e165 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3117,15 +3117,15 @@ void GMainWindow::UpdateFilterText() {
 void GMainWindow::UpdateAAText() {
     const auto aa_mode = Settings::values.anti_aliasing.GetValue();
     switch (aa_mode) {
-    case Settings::AntiAliasing::Fxaa:
-        aa_status_button->setText(tr("FXAA"));
-        break;
     case Settings::AntiAliasing::None:
         aa_status_button->setText(tr("NO AA"));
         break;
-    default:
+    case Settings::AntiAliasing::Fxaa:
         aa_status_button->setText(tr("FXAA"));
         break;
+    default:
+        aa_status_button->setText(tr("NO AA"));
+        break;
     }
 }
 
-- 
cgit v1.2.3