From 0c1c663062c923c3dfdcc86c8024cfed9b24680a Mon Sep 17 00:00:00 2001
From: Adam Sawicki <adam.sawicki@amd.com>
Date: Fri, 25 Aug 2017 17:28:57 +0200
Subject: [PATCH] Two small fixes.

---
 bin/VulkanSample_Release_2015.exe | Bin 88064 -> 88064 bytes
 src/vk_mem_alloc.h                |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/VulkanSample_Release_2015.exe b/bin/VulkanSample_Release_2015.exe
index a79111cc577239cbea3f7da0f78557f76cb36a45..c213b25c77969a61f888231aa7691a2b4e9ecae2 100644
GIT binary patch
delta 99
zcmZqJz}m2Zbpr<@v#QgA&D@NU|Ez(GNCqHa0^(R84v}MI2w`Ic2{FLrcz|pXAl?F$
b+k%jrJpaEW*r472*RnBkZO>$5oE``O{=yZn

delta 99
zcmZqJz}m2Zbpr<@vuEm*&D@NU|Ez(GNCqHa0^(R84v}MI2w`Ic2{FLrcz|pXAl?F$
b+k%jrJpaEW*r472*RnBkY|mt4oE``OI<pqk

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 6039e22..3acfbf8 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -1106,7 +1106,7 @@ private:
 
 #if VMA_DEBUG_GLOBAL_MUTEX
     static VMA_MUTEX gDebugGlobalMutex;
-    #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex);
+    #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true);
 #else
     #define VMA_DEBUG_GLOBAL_MUTEX_LOCK
 #endif
@@ -2857,6 +2857,7 @@ void VmaBlock::Init(
 
 void VmaBlock::Destroy(VmaAllocator allocator)
 {
+    VMA_ASSERT(IsEmpty());
     VMA_ASSERT(m_hMemory != VK_NULL_HANDLE);
     if(m_pMappedData != VMA_NULL)
     {