From d3067c362074f0823723790f4f6885265932f25c Mon Sep 17 00:00:00 2001
From: Adam Sawicki <adam.sawicki@amd.com>
Date: Tue, 7 Dec 2021 16:48:07 +0100
Subject: [PATCH] Improved NATVIS file - added support for
 VmaIntrusiveLinkedList usage

---
 src/vk_mem_alloc.natvis | 101 ++++++++++++++++++++++++++--------------
 1 file changed, 66 insertions(+), 35 deletions(-)

diff --git a/src/vk_mem_alloc.natvis b/src/vk_mem_alloc.natvis
index 85c7533..92215d8 100644
--- a/src/vk_mem_alloc.natvis
+++ b/src/vk_mem_alloc.natvis
@@ -1,40 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-    <Type Name="VmaRawList&lt;*&gt;">
-        <DisplayString>{{ Count={m_Count} }}</DisplayString>
-        <Expand>
-            <Item Name="[Count]">m_Count</Item>
-            <LinkedListItems>
-                <Size>m_Count</Size>
-                <HeadPointer>m_pFront</HeadPointer>
-                <NextPointer>pNext</NextPointer>
-                <ValueNode>Value</ValueNode>
-            </LinkedListItems>
-        </Expand>
-    </Type>
+  <Type Name="VmaRawList&lt;*&gt;">
+      <DisplayString>{{ Count={m_Count} }}</DisplayString>
+      <Expand>
+          <Item Name="[Count]">m_Count</Item>
+          <LinkedListItems>
+              <Size>m_Count</Size>
+              <HeadPointer>m_pFront</HeadPointer>
+              <NextPointer>pNext</NextPointer>
+              <ValueNode>Value</ValueNode>
+          </LinkedListItems>
+      </Expand>
+  </Type>
 
-    <Type Name="VmaList&lt;*&gt;">
-        <DisplayString>{{ Count={m_RawList.m_Count} }}</DisplayString>
-        <Expand>
-            <Item Name="[Count]">m_RawList.m_Count</Item>
-            <LinkedListItems>
-                <Size>m_RawList.m_Count</Size>
-                <HeadPointer>m_RawList.m_pFront</HeadPointer>
-                <NextPointer>pNext</NextPointer>
-                <ValueNode>Value</ValueNode>
-            </LinkedListItems>
-        </Expand>
-    </Type>
+  <Type Name="VmaList&lt;*&gt;">
+      <DisplayString>{{ Count={m_RawList.m_Count} }}</DisplayString>
+      <Expand>
+          <Item Name="[Count]">m_RawList.m_Count</Item>
+          <LinkedListItems>
+              <Size>m_RawList.m_Count</Size>
+              <HeadPointer>m_RawList.m_pFront</HeadPointer>
+              <NextPointer>pNext</NextPointer>
+              <ValueNode>Value</ValueNode>
+          </LinkedListItems>
+      </Expand>
+  </Type>
 
-    <Type Name="VmaVector&lt;*&gt;">
-        <DisplayString>{{ Count={m_Count} }}</DisplayString>
-        <Expand>
-            <Item Name="[Count]">m_Count</Item>
-            <Item Name="[Capacity]">m_Capacity</Item>
-            <ArrayItems>
-                <Size>m_Count</Size>
-                <ValuePointer>m_pArray</ValuePointer>
-            </ArrayItems>
-        </Expand>
-    </Type>
+  <Type Name="VmaVector&lt;*&gt;">
+      <DisplayString>{{ Count={m_Count} }}</DisplayString>
+      <Expand>
+          <Item Name="[Count]">m_Count</Item>
+          <Item Name="[Capacity]">m_Capacity</Item>
+          <ArrayItems>
+              <Size>m_Count</Size>
+              <ValuePointer>m_pArray</ValuePointer>
+          </ArrayItems>
+      </Expand>
+  </Type>
+
+  <!--
+    Due to custom way of accesing next items in
+    VmaIntrusiveLinkedList via methods in provided type traits,
+    every specialization must be manually added with
+    custom <NextPointer> field describing proper way of iterating the list.
+  -->
+  <Type Name="VmaIntrusiveLinkedList&lt;VmaDedicatedAllocationListItemTraits&gt;">
+    <DisplayString>{{ Count={m_Count} }}</DisplayString>
+    <Expand>
+      <Item Name="[Count]">m_Count</Item>
+      <LinkedListItems>
+        <Size>m_Count</Size>
+        <HeadPointer>m_Front</HeadPointer>
+        <NextPointer>m_DedicatedAllocation.m_Next</NextPointer>
+        <ValueNode>*this</ValueNode>
+      </LinkedListItems>
+    </Expand>
+  </Type>
+  <Type Name="VmaIntrusiveLinkedList&lt;VmaPoolListItemTraits&gt;">
+    <DisplayString>{{ Count={m_Count} }}</DisplayString>
+    <Expand>
+      <Item Name="[Count]">m_Count</Item>
+      <LinkedListItems>
+        <Size>m_Count</Size>
+        <HeadPointer>m_Front</HeadPointer>
+        <NextPointer>m_NextPool</NextPointer>
+        <ValueNode>*this</ValueNode>
+      </LinkedListItems>
+    </Expand>
+  </Type>
 </AutoVisualizer>
\ No newline at end of file