commit 0dbbaad0404d094744355152ebe41c5ca62a2aae
author Adam Sawicki <Adam.Sawicki@amd.com> Fri Sep 07 17:43:40 2018 +0200
committer Adam Sawicki <Adam.Sawicki@amd.com> Fri Sep 07 17:43:40 2018 +0200
tree 2fb407e716b1f190c32832f805736447305807ef
parent 8092715d2ca993bd0d4889a5504009c9929d5e0a

Minor additions, including function VmaPrevPow2.

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 4f98d15..2f55b66 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -2997,6 +2997,29 @@
     return v;

 }

 

+// Returns largest power of 2 less or equal to v.

+static inline uint32_t VmaPrevPow2(uint32_t v)

+{

+    v |= v >> 1;

+    v |= v >> 2;

+    v |= v >> 4;

+    v |= v >> 8;

+    v |= v >> 16;

+    v = v ^ (v >> 1);

+    return v;

+}

+static inline uint64_t VmaPrevPow2(uint64_t v)

+{

+    v |= v >> 1;

+    v |= v >> 2;

+    v |= v >> 4;

+    v |= v >> 8;

+    v |= v >> 16;

+    v |= v >> 32;

+    v = v ^ (v >> 1);

+    return v;

+}

+

 static inline bool VmaStrIsEmpty(const char* pStr)

 {

     return pStr == VMA_NULL || *pStr == '\0';

@@ -6586,6 +6609,7 @@
 void VmaBlockMetadata_Generic::Init(VkDeviceSize size)

 {

     VmaBlockMetadata::Init(size);

+

     m_FreeCount = 1;

     m_SumFreeSize = size;

 

@@ -6595,6 +6619,7 @@
     suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;

     suballoc.hAllocation = VK_NULL_HANDLE;

 

+    VMA_ASSERT(size > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER);

     m_Suballocations.push_back(suballoc);

     VmaSuballocationList::iterator suballocItem = m_Suballocations.end();

     --suballocItem;