commit 3dadc82bce472bfc34828efff2d9cb9cb79a1c88
author Adam Sawicki <adam.sawicki@amd.com> Fri Oct 23 15:20:54 2020 +0200
committer Adam Sawicki <adam.sawicki@amd.com> Fri Oct 23 15:20:54 2020 +0200
tree a47956212bb4f73fef9abf6a6a741b1834c610c2
parent 4075d9ef40df01697e85cd861f71cc4fdef4f157
parent 3528e2aed3e8808f33e1e7d63eeb1560456a605a

Merge branch 'master' into PoolCustomPnext

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index e427da1..18e644e 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -3037,6 +3037,9 @@
     become lost, set this value to 0.

     */

     uint32_t frameInUseCount;

+    /** TODO

+    */

+    void* pMemoryAllocateNext;

 } VmaPoolCreateInfo;

 

 /** \brief Describes parameter of existing #VmaPool.

@@ -7001,7 +7004,8 @@
         VkDeviceSize bufferImageGranularity,

         uint32_t frameInUseCount,

         bool explicitBlockSize,

-        uint32_t algorithm);

+        uint32_t algorithm,

+        void* pMemoryAllocateNext);

     ~VmaBlockVector();

 

     VkResult CreateMinBlocks();

@@ -7084,6 +7088,7 @@
     const uint32_t m_FrameInUseCount;

     const bool m_ExplicitBlockSize;

     const uint32_t m_Algorithm;

+    void* const m_pMemoryAllocateNext;

     VMA_RW_MUTEX m_Mutex;

 

     /* There can be at most one allocation that is completely empty (except when minBlockCount > 0) -

@@ -12534,7 +12539,8 @@
         (createInfo.flags & VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(),

         createInfo.frameInUseCount,

         createInfo.blockSize != 0, // explicitBlockSize

-        createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK), // algorithm

+        createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK,

+        createInfo.pMemoryAllocateNext), // algorithm

     m_Id(0),

     m_Name(VMA_NULL)

 {

@@ -12573,7 +12579,8 @@
     VkDeviceSize bufferImageGranularity,

     uint32_t frameInUseCount,

     bool explicitBlockSize,

-    uint32_t algorithm) :

+    uint32_t algorithm,

+    void* pMemoryAllocateNext) :

     m_hAllocator(hAllocator),

     m_hParentPool(hParentPool),

     m_MemoryTypeIndex(memoryTypeIndex),

@@ -12584,6 +12591,7 @@
     m_FrameInUseCount(frameInUseCount),

     m_ExplicitBlockSize(explicitBlockSize),

     m_Algorithm(algorithm),

+    m_pMemoryAllocateNext(pMemoryAllocateNext),

     m_HasEmptyBlock(false),

     m_Blocks(VmaStlAllocator<VmaDeviceMemoryBlock*>(hAllocator->GetAllocationCallbacks())),

     m_NextBlockId(0)

@@ -13267,6 +13275,7 @@
 VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex)

 {

     VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };

+    allocInfo.pNext = m_pMemoryAllocateNext;

     allocInfo.memoryTypeIndex = m_MemoryTypeIndex;

     allocInfo.allocationSize = blockSize;

 

@@ -15770,7 +15779,8 @@
             GetBufferImageGranularity(),

             pCreateInfo->frameInUseCount,

             false, // explicitBlockSize

-            false); // linearAlgorithm

+            false, // linearAlgorithm

+            VMA_NULL); // pMemoryAllocateNext

         // No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here,

         // becase minBlockCount is 0.

         m_pDedicatedAllocations[memTypeIndex] = vma_new(this, AllocationVectorType)(VmaStlAllocator<VmaAllocation>(GetAllocationCallbacks()));