commit b3687caab22e74f26bbb864d9ac6e3cec8776436
author Adam Sawicki <adam.sawicki@amd.com> Fri Jul 26 15:14:27 2019 +0200
committer GitHub <noreply@github.com> Fri Jul 26 15:14:27 2019 +0200
tree 4b3fb419a044673e333da9b8379fe4dc301f3e22
parent 5afe7845a1571ae2ceb46583e103d14d6492d2ec
parent fd5077cd361f43d218d79570943442ba9cbe33cd

Merge pull request #74 from benvanik/patch-1

Adding a VmaVector constructor for C++11 compatibility

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 0238038..a8e083e 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -4097,6 +4097,9 @@
     {

     }

     

+    VmaVector(size_t count, const T& value, const AllocatorT& allocator)

+        : VmaVector(count, allocator) {}

+    

     VmaVector(const VmaVector<T, AllocatorT>& src) :

         m_Allocator(src.m_Allocator),

         m_pArray(src.m_Count ? (T*)VmaAllocateArray<T>(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL),

@@ -12127,7 +12130,7 @@
         void* pMappedData;

     };

     VmaVector< BlockInfo, VmaStlAllocator<BlockInfo> >

-        blockInfo(blockCount, VmaStlAllocator<BlockInfo>(m_hAllocator->GetAllocationCallbacks()));

+        blockInfo(blockCount, BlockInfo(), VmaStlAllocator<BlockInfo>(m_hAllocator->GetAllocationCallbacks()));

     memset(blockInfo.data(), 0, blockCount * sizeof(BlockInfo));

 

     // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED.