From 40f13be32081fcbb854c3c6f7c1b14e18e9557fa Mon Sep 17 00:00:00 2001
From: CamilleLaVey <camillelavey99@gmail.com>
Date: Thu, 15 Jan 2026 06:06:14 +0100
Subject: [PATCH] [memory_tracker] re-ordered member variables

---
 src/tests/video_core/memory_tracker.cpp    | 2 +-
 src/video_core/buffer_cache/word_manager.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp
index 949dc5cdfd..b5b2a98216 100644
--- a/src/tests/video_core/memory_tracker.cpp
+++ b/src/tests/video_core/memory_tracker.cpp
@@ -60,8 +60,8 @@ public:
 
 private:
     std::unordered_map<u64, int> page_table;
-    size_t update_calls = 0;
     std::vector<std::tuple<VAddr, u64, int>> calls;
+    size_t update_calls = 0;
 };
 
 } // Anonymous namespace
diff --git a/src/video_core/buffer_cache/word_manager.h b/src/video_core/buffer_cache/word_manager.h
index e6e236687d..51f38a2eb9 100644
--- a/src/video_core/buffer_cache/word_manager.h
+++ b/src/video_core/buffer_cache/word_manager.h
@@ -498,17 +498,17 @@ private:
         std::sort(ranges.begin(), ranges.end(),
                   [](const auto& a, const auto& b) { return a.first < b.first; });
         // Coalesce adjacent/contiguous ranges
-        std::vector<std::pair<VAddr, u64>> coalesced;
+        std::vector<std::pair<VAddr, size_t>> coalesced;
         coalesced.reserve(ranges.size());
         VAddr cur_addr = ranges[0].first;
-        u64 cur_size = ranges[0].second;
+        size_t cur_size = static_cast<size_t>(ranges[0].second);
         for (size_t i = 1; i < ranges.size(); ++i) {
             if (cur_addr + cur_size == ranges[i].first) {
-                cur_size += ranges[i].second;
+                cur_size += static_cast<size_t>(ranges[i].second);
             } else {
                 coalesced.emplace_back(cur_addr, cur_size);
                 cur_addr = ranges[i].first;
-                cur_size = ranges[i].second;
+                cur_size = static_cast<size_t>(ranges[i].second);
             }
         }
         coalesced.emplace_back(cur_addr, cur_size);