From 809257051b6b7d32fc811847ba14c23b78a2f59c Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 17 Oct 2024 21:53:46 +0200
Subject: [PATCH] [dxvk] Rename unspecific "next" member in
 DxvkResourceAllocation

---
 src/dxvk/dxvk_memory.cpp | 12 ++++++------
 src/dxvk/dxvk_memory.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dxvk/dxvk_memory.cpp b/src/dxvk/dxvk_memory.cpp
index 891ba482a..5e82c9f4f 100644
--- a/src/dxvk/dxvk_memory.cpp
+++ b/src/dxvk/dxvk_memory.cpp
@@ -213,8 +213,8 @@ namespace dxvk {
     if (!allocation)
       return nullptr;
 
-    m_pools[poolIndex] = allocation->m_next;
-    allocation->m_next = nullptr;
+    m_pools[poolIndex] = allocation->m_nextCached;
+    allocation->m_nextCached = nullptr;
     return allocation;
   }
 
@@ -321,7 +321,7 @@ namespace dxvk {
     { std::unique_lock freeLock(m_freeMutex);
       auto& list = m_freeLists[poolIndex];
 
-      allocation->m_next = list.head;
+      allocation->m_nextCached = list.head;
       list.head = allocation;
 
       if (++list.size < list.capacity)
@@ -1226,7 +1226,7 @@ namespace dxvk {
           updateMemoryHeapStats(allocation->m_type->properties.heapIndex);
       }
 
-      m_allocationPool.free(std::exchange(allocation, allocation->m_next));
+      m_allocationPool.free(std::exchange(allocation, allocation->m_nextCached));
     }
   }
 
@@ -1424,7 +1424,7 @@ namespace dxvk {
         allocation->m_flags.set(DxvkAllocationFlag::Cacheable);
 
         if (tail) {
-          tail->m_next = allocation;
+          tail->m_nextCached = allocation;
           tail = allocation;
         } else {
           head = allocation;
@@ -1435,7 +1435,7 @@ namespace dxvk {
       }
 
       if (tail) {
-        tail->m_next = cache->assignCache(allocationSize, head);
+        tail->m_nextCached = cache->assignCache(allocationSize, head);
         return true;
       }
     }
diff --git a/src/dxvk/dxvk_memory.h b/src/dxvk/dxvk_memory.h
index 4739dc875..588e596cf 100644
--- a/src/dxvk/dxvk_memory.h
+++ b/src/dxvk/dxvk_memory.h
@@ -608,7 +608,7 @@ namespace dxvk {
     DxvkMemoryAllocator*        m_allocator = nullptr;
     DxvkMemoryType*             m_type = nullptr;
 
-    DxvkResourceAllocation*     m_next = nullptr;
+    DxvkResourceAllocation*     m_nextCached = nullptr;
 
     void destroyBufferViews();