summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2021-11-19 01:20:27 -0800
committerGravatar GitHub2021-11-19 01:20:27 -0800
commitb44fbf6cddea169131fa49a4f899792616889b27 (patch)
treeab239cac63dee752ee706bbecfe458fc1146c816
parentMerge pull request #7273 from fpdotmonkey/submodule-checkout-command-on-new-line (diff)
parentmain: Fix default AA name (diff)
downloadyuzu-b44fbf6cddea169131fa49a4f899792616889b27.tar.gz
yuzu-b44fbf6cddea169131fa49a4f899792616889b27.tar.xz
yuzu-b44fbf6cddea169131fa49a4f899792616889b27.zip
Merge pull request #7369 from Morph1984/amd-fsr-statusbar
main: Shorten AMD FSR status bar text
Diffstat (limited to '')
-rw-r--r--src/yuzu/configuration/configure_graphics.ui2
-rw-r--r--src/yuzu/main.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 660b68c1c..9241678e4 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -429,7 +429,7 @@
429 </item> 429 </item>
430 <item> 430 <item>
431 <property name="text"> 431 <property name="text">
432 <string>AMD's FidelityFX™️ Super Resolution [Vulkan Only]</string> 432 <string>AMD FidelityFX™️ Super Resolution [Vulkan Only]</string>
433 </property> 433 </property>
434 </item> 434 </item>
435 </widget> 435 </widget>
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 6f83475b9..c4c76b094 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3106,7 +3106,7 @@ void GMainWindow::UpdateFilterText() {
3106 filter_status_button->setText(tr("SCALEFORCE")); 3106 filter_status_button->setText(tr("SCALEFORCE"));
3107 break; 3107 break;
3108 case Settings::ScalingFilter::Fsr: 3108 case Settings::ScalingFilter::Fsr:
3109 filter_status_button->setText(tr("AMD'S FIDELITYFX SR")); 3109 filter_status_button->setText(tr("FSR"));
3110 break; 3110 break;
3111 default: 3111 default:
3112 filter_status_button->setText(tr("BILINEAR")); 3112 filter_status_button->setText(tr("BILINEAR"));
@@ -3117,15 +3117,15 @@ void GMainWindow::UpdateFilterText() {
3117void GMainWindow::UpdateAAText() { 3117void GMainWindow::UpdateAAText() {
3118 const auto aa_mode = Settings::values.anti_aliasing.GetValue(); 3118 const auto aa_mode = Settings::values.anti_aliasing.GetValue();
3119 switch (aa_mode) { 3119 switch (aa_mode) {
3120 case Settings::AntiAliasing::Fxaa:
3121 aa_status_button->setText(tr("FXAA"));
3122 break;
3123 case Settings::AntiAliasing::None: 3120 case Settings::AntiAliasing::None:
3124 aa_status_button->setText(tr("NO AA")); 3121 aa_status_button->setText(tr("NO AA"));
3125 break; 3122 break;
3126 default: 3123 case Settings::AntiAliasing::Fxaa:
3127 aa_status_button->setText(tr("FXAA")); 3124 aa_status_button->setText(tr("FXAA"));
3128 break; 3125 break;
3126 default:
3127 aa_status_button->setText(tr("NO AA"));
3128 break;
3129 } 3129 }
3130} 3130}
3131 3131