1 files changed, 14 insertions, 1 deletions

diff --git a/src/video_core/textures/texture.cpp b/src/video_core/textures/texture.cpp
index b2d5bb03e..ba066f98f 100644
--- a/src/video_core/textures/texture.cpp
+++ b/src/video_core/textures/texture.cpp
@@ -6,6 +6,7 @@
 #include <array>
 
 #include "common/cityhash.h"
+#include "common/settings.h"
 #include "video_core/textures/texture.h"
 
 using Tegra::Texture::TICEntry;
@@ -61,7 +62,19 @@ std::array<float, 4> TSCEntry::BorderColor() const noexcept {
 }
 
 float TSCEntry::MaxAnisotropy() const noexcept {
-    return static_cast<float>(1U << max_anisotropy);
+    if (max_anisotropy == 0 && mipmap_filter != TextureMipmapFilter::Linear) {
+        return 1.0f;
+    }
+    const auto anisotropic_settings = Settings::values.max_anisotropy.GetValue();
+    u32 new_max_anisotropic{};
+    if (anisotropic_settings == 0) {
+        const auto anisotropic_based_onscale = Settings::values.resolution_info.up_scale >>
+                                               Settings::values.resolution_info.down_shift;
+        new_max_anisotropic = std::max(anisotropic_based_onscale + 1U, 1U);
+    } else {
+        new_max_anisotropic = Settings::values.max_anisotropy.GetValue();
+    }
+    return static_cast<float>(1U << std::min(max_anisotropy + anisotropic_settings - 1, 31U));
 }
 
 } // namespace Tegra::Texture