Merge Switch 2 work from local Eden (nx2 at b0dd3fe)

1 files changed, 17 insertions, 0 deletions

diff --git a/src/video_core/buffer_cache/usage_tracker.h b/src/video_core/buffer_cache/usage_tracker.h
index 6f84e463e3..3e2da8bc0b 100644
--- a/src/video_core/buffer_cache/usage_tracker.h
+++ b/src/video_core/buffer_cache/usage_tracker.h
@@ -6,6 +6,10 @@
 
 #pragma once
 
+#include <array>
+#include <utility>
+#include <vector>
+
 #include "common/alignment.h"
 #include "common/common_types.h"
 
@@ -24,9 +28,19 @@ public:
 
     void Reset() noexcept {
         std::ranges::fill(pages, 0ULL);
+        recent.fill({~u64{0}, 0});
     }
 
     void Track(u64 offset, u64 size) noexcept {
+        // Tracking is idempotent until Reset: skip ranges tracked just before. Draws bind the
+        // same (often multi-megabyte) storage buffers again and again, and each Track wrote a
+        // word per 4 KiB of the range.
+        for (const auto& [recent_offset, recent_size] : recent) {
+            if (recent_offset == offset && recent_size == size) {
+                return;
+            }
+        }
+        recent[recent_cursor++ % recent.size()] = {offset, size};
         const size_t page = offset >> BUFFER_PAGE_SHIFT;
         const size_t page_end = (offset + size) >> BUFFER_PAGE_SHIFT;
         if (page_end < page || page_end >= pages.size()) {
@@ -83,6 +97,9 @@ private:
 
 private:
     std::vector<u64> pages;
+    /// Ranges tracked last, (offset, size).
+    std::array<std::pair<u64, u64>, 4> recent{{{~u64{0}, 0}, {~u64{0}, 0}, {~u64{0}, 0}, {~u64{0}, 0}}};
+    size_t recent_cursor{};
 };
 
 } // namespace VideoCommon