commit 526b596b6999d14fc9d8de3da3be66feb5e1ed1d
author Adam Sawicki <adam.sawicki@amd.com> Wed Feb 06 11:18:29 2019 +0100
committer GitHub <noreply@github.com> Wed Feb 06 11:18:29 2019 +0100
tree 2c8d8bbd9fef0df216375c139d39820f5226b3fb
parent cac7d7509eef9b355e5fac03602b8228b4c94612
parent 65f096555d68c11fbefc11b7561189c70f0ce183

Merge pull request #55 from amerkoleci/various_improvements

Fixes VMA_STATS_STRING_ENABLED define and unused variable warning

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 6d57532..914399a 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -1960,7 +1960,9 @@
     VmaAllocator allocator,

     VmaStats* pStats);

 

+#ifndef VMA_STATS_STRING_ENABLED

 #define VMA_STATS_STRING_ENABLED 1

+#endif

 

 #if VMA_STATS_STRING_ENABLED

 

@@ -3561,6 +3563,8 @@
     return pStr == VMA_NULL || *pStr == '\0';

 }

 

+#if VMA_STATS_STRING_ENABLED

+

 static const char* VmaAlgorithmToStr(uint32_t algorithm)

 {

     switch(algorithm)

@@ -3577,6 +3581,8 @@
     }

 }

 

+#endif // #if VMA_STATS_STRING_ENABLED

+

 #ifndef VMA_SORT

 

 template<typename Iterator, typename Compare>

@@ -12972,7 +12978,6 @@
                 size_t freeSpaceOrigBlockIndex = m_BlockInfos[freeSpaceInfoIndex].origBlockIndex;

                 VmaDeviceMemoryBlock* pFreeSpaceBlock = m_pBlockVector->GetBlock(freeSpaceOrigBlockIndex);

                 VmaBlockMetadata_Generic* pFreeSpaceMetadata = (VmaBlockMetadata_Generic*)pFreeSpaceBlock->m_pMetadata;

-                VkDeviceSize freeSpaceBlockSize = pFreeSpaceMetadata->GetSize();

 

                 // Same block

                 if(freeSpaceInfoIndex == srcBlockInfoIndex)