From d1b9a5adcceb0c61e03293db9840ca6844442398 Mon Sep 17 00:00:00 2001
From: squidbus <175574877+squidbus@users.noreply.github.com>
Date: Fri, 24 Jan 2025 00:23:18 -0800
Subject: [PATCH] texture_cache: Do not overwrite overlap hit with a miss.
 (#2217)

---
 src/video_core/texture_cache/texture_cache.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/video_core/texture_cache/texture_cache.cpp b/src/video_core/texture_cache/texture_cache.cpp
index 04711539c..e995b10b2 100644
--- a/src/video_core/texture_cache/texture_cache.cpp
+++ b/src/video_core/texture_cache/texture_cache.cpp
@@ -345,8 +345,13 @@ ImageId TextureCache::FindImage(BaseDesc& desc, FindFlags flags) {
             view_slice = -1;
 
             const auto& merged_info = image_id ? slot_images[image_id].info : info;
-            std::tie(image_id, view_mip, view_slice) =
+            auto [overlap_image_id, overlap_view_mip, overlap_view_slice] =
                 ResolveOverlap(merged_info, desc.type, cache_id, image_id);
+            if (overlap_image_id) {
+                image_id = overlap_image_id;
+                view_mip = overlap_view_mip;
+                view_slice = overlap_view_slice;
+            }
         }
     }