diff --git a/src/android/app/src/main/res/values-ar/strings.xml b/src/android/app/src/main/res/values-ar/strings.xml
index dd03ec453f..bad0e25dac 100644
--- a/src/android/app/src/main/res/values-ar/strings.xml
+++ b/src/android/app/src/main/res/values-ar/strings.xml
@@ -1088,7 +1088,6 @@
فاتح
داكن
- لا شيء
خلفيات سوداء
diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml
index 1c3b6c148f..b76e15d1b7 100644
--- a/src/android/app/src/main/res/values-de/strings.xml
+++ b/src/android/app/src/main/res/values-de/strings.xml
@@ -1004,7 +1004,6 @@ Wirklich fortfahren?
Hell
Dunkel
- Keine
Schwarze Hintergründe
diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml
index a5092c4b2f..c07bbb6fe9 100644
--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@@ -1080,7 +1080,6 @@
Claro
Oscuro
- Nada
Fondos oscuros
diff --git a/src/android/app/src/main/res/values-fa/strings.xml b/src/android/app/src/main/res/values-fa/strings.xml
index 39f0432d8e..98b94d166d 100644
--- a/src/android/app/src/main/res/values-fa/strings.xml
+++ b/src/android/app/src/main/res/values-fa/strings.xml
@@ -808,9 +808,6 @@
x4
x8
x16
- x32
- x64
- None
پسزمینه مشکی
diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml
index 602a542c5f..8e2b3796a9 100644
--- a/src/android/app/src/main/res/values-fr/strings.xml
+++ b/src/android/app/src/main/res/values-fr/strings.xml
@@ -1016,7 +1016,6 @@
Lumineux
Sombre
- Aucun
Arrière-plan noir
diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml
index 4bcebd5a8c..5921f6e588 100644
--- a/src/android/app/src/main/res/values-pl/strings.xml
+++ b/src/android/app/src/main/res/values-pl/strings.xml
@@ -948,7 +948,6 @@
Jasny
Ciemny
- Brak
Czarne tła
diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml
index 8581415757..ae1467c492 100644
--- a/src/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -897,7 +897,6 @@
Claro
Escuro
- Nenhum
Planos de fundo pretos
diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml
index 3dbeb6ffdb..370c6d206e 100644
--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@@ -1084,7 +1084,6 @@
Светлая
Темная
- Отключено
Чёрный фон
diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml
index 83893210bd..0109943222 100644
--- a/src/android/app/src/main/res/values-uk/strings.xml
+++ b/src/android/app/src/main/res/values-uk/strings.xml
@@ -1066,7 +1066,6 @@
Світла
Темна
- Жодного
Чорний фон
diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml
index 1e6ba26041..7af46a99dd 100644
--- a/src/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -1078,7 +1078,6 @@
浅色
深色
- 无
使用黑色背景
diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml
index 1612494b73..8f24400511 100644
--- a/src/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -926,7 +926,6 @@
淺色
深色
- 無
黑色背景
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 1bad110d14..74c2fdb60c 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -471,9 +471,6 @@
- @string/multiplier_x4
- @string/multiplier_x8
- @string/multiplier_x16
- - @string/multiplier_x32
- - @string/multiplier_x64
- - @string/multiplier_none
- 0
@@ -482,9 +479,6 @@
- 3
- 4
- 5
- - 6
- - 7
- - 8
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index bb1d85db82..ea91942f05 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -1185,9 +1185,6 @@
x4
x8
x16
- x32
- x64
- None
Black backgrounds
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index 3d0131de70..a43df6924c 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -128,7 +128,7 @@ ENUM(TimeZone, Auto, Default, Cet, Cst6Cdt, Cuba, Eet, Egypt, Eire, Est, Est5Edt
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, X32, X64, None);
+ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16);
ENUM(AstcDecodeMode, Cpu, Gpu, CpuAsynchronous);
ENUM(AstcRecompression, Uncompressed, Bc1, Bc3);
ENUM(FramePacingMode, Target_Auto, Target_30, Target_60, Target_90, Target_120);
diff --git a/src/qt_common/config/shared_translation.cpp b/src/qt_common/config/shared_translation.cpp
index 26597d412c..7fd55ce038 100644
--- a/src/qt_common/config/shared_translation.cpp
+++ b/src/qt_common/config/shared_translation.cpp
@@ -522,9 +522,6 @@ std::unique_ptr ComboboxEnumeration(QObject* parent) {
PAIR(AnisotropyMode, X4, tr("4x")),
PAIR(AnisotropyMode, X8, tr("8x")),
PAIR(AnisotropyMode, X16, tr("16x")),
- PAIR(AnisotropyMode, X32, tr("32x")),
- PAIR(AnisotropyMode, X64, tr("64x")),
- PAIR(AnisotropyMode, None, tr("None")),
}});
translations->insert(
{Settings::EnumMetadata::Index(),
diff --git a/src/video_core/textures/texture.cpp b/src/video_core/textures/texture.cpp
index d32872e35d..78eb577e10 100644
--- a/src/video_core/textures/texture.cpp
+++ b/src/video_core/textures/texture.cpp
@@ -80,16 +80,16 @@ float TSCEntry::MaxAnisotropy() const noexcept {
case Settings::AnisotropyMode::X4:
case Settings::AnisotropyMode::X8:
case Settings::AnisotropyMode::X16:
- case Settings::AnisotropyMode::X32:
- case Settings::AnisotropyMode::X64:
- added_anisotropic = u32(anisotropic_settings) - 1U;
+ added_anisotropic = s32(anisotropic_settings) - 1;
break;
- case Settings::AnisotropyMode::Automatic:
- added_anisotropic = Settings::values.resolution_info.up_scale >> Settings::values.resolution_info.down_shift;
- added_anisotropic = (std::max)(added_anisotropic - 1U, 0U);
+ case Settings::AnisotropyMode::Automatic: {
+ const u32 resolution_scale = Settings::values.resolution_info.up_scale >>
+ Settings::values.resolution_info.down_shift;
+ if (resolution_scale > 1U) {
+ added_anisotropic = static_cast(resolution_scale - 1U);
+ }
break;
- case Settings::AnisotropyMode::None:
- return 1.0f; //No use of anisotropy
+ }
}
return float(1U << (max_anisotropy + added_anisotropic));
}