AuroraMiddleware/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator synced 2024-11-05 04:10:06 +00:00
Code Issues Projects Releases Wiki Activity

Fixes in multithreading in VmaBlockVector::Free

Browse Source 
Also improved the documentation of vmaGetPoolStatistics.
See #451 - thanks @danginsburg
This commit is contained in:
asawicki 2024-10-28 17:51:10 +01:00
parent 1c35ba99ce
commit 05973d8aeb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/vk_mem_alloc.h
View File

@ -1836,6 +1836,9 @@ VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(
\param allocator Allocator object. \param allocator Allocator object.
\param pool Pool object. \param pool Pool object.
\param[out] pPoolStats Statistics of specified pool. \param[out] pPoolStats Statistics of specified pool.
Note that when using the pool from multiple threads, returned information may immediately
become outdated.
*/ */
VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics( VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics(
VmaAllocator VMA_NOT_NULL allocator, VmaAllocator VMA_NOT_NULL allocator,
@ -11605,6 +11608,10 @@ void VmaBlockVector::Free(const VmaAllocation hAllocation)
} }
IncrementallySortBlocks(); IncrementallySortBlocks();
m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize());
hAllocation->Destroy(m_hAllocator);
m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation);
} }
// Destruction of a free block. Deferred until this point, outside of mutex // Destruction of a free block. Deferred until this point, outside of mutex
@ -11615,10 +11622,6 @@ void VmaBlockVector::Free(const VmaAllocation hAllocation)
pBlockToDelete->Destroy(m_hAllocator); pBlockToDelete->Destroy(m_hAllocator);
vma_delete(m_hAllocator, pBlockToDelete); vma_delete(m_hAllocator, pBlockToDelete);
} }
m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize());
hAllocation->Destroy(m_hAllocator);
m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation);
} }
VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const