video_core: Add per-image anisotropy heuristics (format & mip count)

1 files changed, 7 insertions, 5 deletions

diff --git a/src/video_core/textures/texture.cpp b/src/video_core/textures/texture.cpp
index 560b3af8a..cb24d0399 100644
--- a/src/video_core/textures/texture.cpp
+++ b/src/video_core/textures/texture.cpp
@@ -62,12 +62,14 @@ std::array<float, 4> TSCEntry::BorderColor() const noexcept {
 }
 
 float TSCEntry::MaxAnisotropy() const noexcept {
-    const bool is_unsupported_mipmap_filter = Settings::values.use_aggressive_anisotropic_filtering
-                                                  ? mipmap_filter == TextureMipmapFilter::None
-                                                  : mipmap_filter != TextureMipmapFilter::Linear;
+    const bool is_suitable_mipmap_filter = Settings::values.use_aggressive_anisotropic_filtering
+                                               ? mipmap_filter != TextureMipmapFilter::None
+                                               : mipmap_filter == TextureMipmapFilter::Linear;
     const bool has_regular_lods = min_lod_clamp == 0 && max_lod_clamp >= 256;
-    if (max_anisotropy == 0 &&
-        (depth_compare_enabled.Value() || !has_regular_lods || is_unsupported_mipmap_filter)) {
+    const bool is_bilinear_filter = min_filter == TextureFilter::Linear &&
+                                    reduction_filter == SamplerReduction::WeightedAverage;
+    if (max_anisotropy == 0 && (depth_compare_enabled.Value() || !has_regular_lods ||
+                                !is_bilinear_filter || !is_suitable_mipmap_filter)) {
         return 1.0f;
     }
     const auto anisotropic_settings = Settings::values.max_anisotropy.GetValue();