From 5588ebccdc8f286a4dbdd0ccdfa7916c7fe75d05 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Wed, 14 Jun 2023 18:24:29 +0200
Subject: [PATCH] early-access version 3675

---
 README.md                                            | 2 +-
 src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 1 +
 src/video_core/textures/texture.cpp                  | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d3345f805..a9a6cdc2d 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3674.
+This is the source code for early-access 3675.
 
 ## Legal Notice
 
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index b11ea0bdf..66bca2279 100755
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -364,6 +364,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device
         .support_snorm_render_buffer = true,
         .support_viewport_index_layer = device.IsExtShaderViewportIndexLayerSupported(),
         .support_geometry_shader_passthrough = device.IsNvGeometryShaderPassthroughSupported(),
+        .support_conditional_barrier = device.SupportsConditionalBarriers(),
     };
 
     if (device.GetMaxVertexInputAttributes() < Maxwell::NumVertexAttributes) {
diff --git a/src/video_core/textures/texture.cpp b/src/video_core/textures/texture.cpp
index 65e92a3ef..56ade0170 100755
--- a/src/video_core/textures/texture.cpp
+++ b/src/video_core/textures/texture.cpp
@@ -62,9 +62,12 @@ std::array<float, 4> TSCEntry::BorderColor() const noexcept {
 }
 
 float TSCEntry::MaxAnisotropy() const noexcept {
-    if (max_anisotropy == 0 && (depth_compare_enabled.Value() ||
-                                (mipmap_filter != TextureMipmapFilter::Linear &&
-                                 !Settings::values.use_aggressive_anisotropic_filtering))) {
+    const bool is_unsupported_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)) {
         return 1.0f;
     }
     const auto anisotropic_settings = Settings::values.max_anisotropy.GetValue();