From fffe0ba299f068e88e56665ddeff4649d26a9ec5 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Sat, 23 Dec 2023 19:37:50 +0100
Subject: [PATCH] Texture Cache: Speedup texture views invalidation

---
 src/video_core/texture_cache/texture_cache.h   | 18 +++++++++++-------
 .../texture_cache/texture_cache_base.h         |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 0d5a1709fb..25b06ca67e 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -1084,6 +1084,7 @@ ImageViewId TextureCache<P>::FindImageView(const TICEntry& config) {
     ImageViewId& image_view_id = pair->second;
     if (is_new) {
         image_view_id = CreateImageView(config);
+        channel_state->image_views_inv[image_view_id] = config;
     }
     return image_view_id;
 }
@@ -2218,14 +2219,17 @@ template <class P>
 void TextureCache<P>::RemoveImageViewReferences(std::span<const ImageViewId> removed_views) {
     for (size_t c : active_channel_ids) {
         auto& channel_info = channel_storage[c];
-        auto it = channel_info.image_views.begin();
-        while (it != channel_info.image_views.end()) {
-            const auto found = std::ranges::find(removed_views, it->second);
-            if (found != removed_views.end()) {
-                it = channel_info.image_views.erase(it);
-            } else {
-                ++it;
+        for (auto image_view_id : removed_views) {
+            auto it_v = channel_info.image_views_inv.find(image_view_id);
+            if (it_v == channel_info.image_views_inv.end()) {
+                continue;
             }
+            auto it = channel_info.image_views.find(it_v->second);
+            channel_info.image_views_inv.erase(it_v);
+            if (it == channel_info.image_views.end()) {
+                continue;
+            }
+            channel_info.image_views.erase(it);
         }
     }
 }
diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h
index 6caf75b461..b9e83ceb22 100644
--- a/src/video_core/texture_cache/texture_cache_base.h
+++ b/src/video_core/texture_cache/texture_cache_base.h
@@ -81,6 +81,7 @@ public:
     std::vector<ImageViewId> compute_image_view_ids;
 
     std::unordered_map<TICEntry, ImageViewId> image_views;
+    std::unordered_map<ImageViewId, TICEntry> image_views_inv;
     std::unordered_map<TSCEntry, SamplerId> samplers;
 
     TextureCacheGPUMap* gpu_page_table;