From 6ab16040705e5b14fe0c9b5f2bae59129c8e0a44 Mon Sep 17 00:00:00 2001
From: Adam Sawicki <adam.sawicki@amd.com>
Date: Wed, 20 Sep 2017 13:27:21 +0200
Subject: [PATCH] Created vk_mem_alloc.natvis file. VmaVectorRemoveSorted:
 Fixed compilation error when STL is used.

---
 bin/VulkanSample_Release_2015.exe | Bin 100352 -> 100352 bytes
 src/vk_mem_alloc.h                |   4 +--
 src/vk_mem_alloc.natvis           |  40 ++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 src/vk_mem_alloc.natvis

diff --git a/bin/VulkanSample_Release_2015.exe b/bin/VulkanSample_Release_2015.exe
index c08cac908914f8deec21b0528dac0eafc11ecce9..ee972ae75445fb0c3e90ac5d47436d6f07beae18 100644
GIT binary patch
delta 511
zcmZpez}7H<Z2=>5eZZm3%#4Pij3JXv!xZ8kb_Yo`zhW#AZ2rYq!sgg~{{L%Um+pFv
z*X$nM?glR17Ovgjy?a@<c^rJe;?a1pfQx~_gZYH<x9)q67BVUx{H`}WI%8B4JX&v;
zh<S9M{x3Rj9|J?{ffCN{6aPhbO<o^nSij{=0S5zvZ?_wVNB1?~Za)G4UXc@?-KRXY
zPk0>s$?Va3vP79*zJ&n<JbGCKJubfRw6r-;%;wP>!1$Wkqx*!1^~Iv6p1mv=JgpCv
zIC*q)cvzn=vhuM0S!C*|eZb@34`$Ea%>N$NM~fvrdwCA{XrJ)wWjXuf|Ns9Uy@6UB
z|3#kx9p%w|)wBED3+-A4h6xDgZrO`)?t{tA;aXw3K#x1T76EzRquWCP<UA=L$HIg8
zpa;-nd_YflcKfIRO|?G6z~Iw;&Zpa*!?F9iXZIP8?iiH}kM10m0*~e+29EKLagH(Z
zaW9?!{{O$3H)8uGYhd6<g1pHD#IZoU#g>s_iy<ROhyf<Y17wSUupJ|Vh!I?F`hP7(
zNl@%<m)2%n%f=|M{iGqI5D(*l>33`yRRp&ufy`iFC`)Ew0O^^yUC@q^-HMTSyJQ99
GbAABCE4f|(

delta 503
zcmZpez}7H<Z2=>5@Y4gEnHdd38AB(VhABk-><*G>e#KbA-~5ZQgthtX|JU5z`5Ld;
zJi6Ttx;0$7zk2twZ1XtyfW@QnU;!5cg9q~o<8R&f94+KM_+4*$bjGM8c(mRw5%cIi
z{a<v^J_d%?10|f@C;p4>o4h&9uzt<?0uBZS-)>(H-|kQWkM3(;y*yVLfWYJ6PiBwS
zlO@s~y)1$r7hiZ<+8iuq^XLs=e9i39eZs@~V$oCIUY3hM>o59PA1HD1>}K$=K3-(y
zVf~}X)K~kU=fNM$zP&~NeXWlbOM3V69Q4(`;MdD?^~eAJ|2=vGIsS`&*vFv4;Msl6
zv-|7|(^>|G2?&So+lz4MtI56LS|K_>4?DaT0eRb_+d~25G)W-G!h`vs2hdBrK&N|l
z`vXmNJH)`?(|yjT+nuBPs%Q6kkM0<i43F*{l>(3EBL<G~j&Y8$@o_Kx|Nj3!d84Dk
zX2pobm#l$-9trX_6A;G&@fKS~hAoDSARz{r91oB!0>XBT3?fEwx#|D47$rfmwq07A
zaV;Ao|MruHj6yt&7pC8_WmFN|oCGq1fgvZEfdQnaeY>C?BfAwN<95jk#^?M1E{3`y

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 474035d..df5c04d 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -2012,8 +2012,8 @@ bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type&
 {
     CmpLess comparator;
     typename VectorT::iterator it = VmaBinaryFindFirstNotLess(
-        vector.data(),
-        vector.data() + vector.size(),
+        vector.begin(),
+        vector.end(),
         value,
         comparator);
     if((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it))
diff --git a/src/vk_mem_alloc.natvis b/src/vk_mem_alloc.natvis
new file mode 100644
index 0000000..0477fa7
--- /dev/null
+++ b/src/vk_mem_alloc.natvis
@@ -0,0 +1,40 @@
+<?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="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>
+</AutoVisualizer>
\ No newline at end of file