From 09e1a2da93f65b74f7194a3c76f952d83c5d597e Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Wed, 12 Aug 2026 15:11:41 -0400 Subject: [PATCH] [TEST] Aniso fixes --- .../app/src/main/res/values-ar/strings.xml | 1 - .../app/src/main/res/values-de/strings.xml | 1 - .../app/src/main/res/values-es/strings.xml | 1 - .../app/src/main/res/values-fa/strings.xml | 3 --- .../app/src/main/res/values-fr/strings.xml | 1 - .../app/src/main/res/values-pl/strings.xml | 1 - .../app/src/main/res/values-pt-rBR/strings.xml | 1 - .../app/src/main/res/values-ru/strings.xml | 1 - .../app/src/main/res/values-uk/strings.xml | 1 - .../app/src/main/res/values-zh-rCN/strings.xml | 1 - .../app/src/main/res/values-zh-rTW/strings.xml | 1 - src/android/app/src/main/res/values/arrays.xml | 6 ------ src/android/app/src/main/res/values/strings.xml | 3 --- src/common/settings_enums.h | 2 +- src/qt_common/config/shared_translation.cpp | 3 --- src/video_core/textures/texture.cpp | 16 ++++++++-------- 16 files changed, 9 insertions(+), 34 deletions(-) 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 549393cad5..0840919428 100644 --- a/src/android/app/src/main/res/values-ar/strings.xml +++ b/src/android/app/src/main/res/values-ar/strings.xml @@ -1107,7 +1107,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 c805526d05..2e4fe728d8 100644 --- a/src/android/app/src/main/res/values-de/strings.xml +++ b/src/android/app/src/main/res/values-de/strings.xml @@ -991,7 +991,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 f7c62ef4f4..418e2869b2 100644 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -1092,7 +1092,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 1083b8228f..7408cc43a9 100644 --- a/src/android/app/src/main/res/values-fr/strings.xml +++ b/src/android/app/src/main/res/values-fr/strings.xml @@ -1004,7 +1004,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 7b62734d9d..e68f1567e4 100644 --- a/src/android/app/src/main/res/values-pl/strings.xml +++ b/src/android/app/src/main/res/values-pl/strings.xml @@ -935,7 +935,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 3034b4acf3..415cb020ae 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 @@ -891,7 +891,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 02cb1b5e89..4386bc680d 100644 --- a/src/android/app/src/main/res/values-ru/strings.xml +++ b/src/android/app/src/main/res/values-ru/strings.xml @@ -1071,7 +1071,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 6e318659bf..e725c991cd 100644 --- a/src/android/app/src/main/res/values-uk/strings.xml +++ b/src/android/app/src/main/res/values-uk/strings.xml @@ -1053,7 +1053,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 0b6322d146..a1971c6b9b 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 @@ -1081,7 +1081,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 aeff146aed..b529d42437 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 @@ -1006,7 +1006,6 @@ 淺色 深色 - 無 黑色背景 diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index 53dd0436dc..daf74bd767 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -513,9 +513,6 @@ @string/multiplier_x4 @string/multiplier_x8 @string/multiplier_x16 - @string/multiplier_x32 - @string/multiplier_x64 - @string/multiplier_none 0 @@ -524,9 +521,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 bbc38e59bf..7cd9c62ff7 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -1246,9 +1246,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)); }