mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-26 16:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed defragmenter not acquiring a lock before touching blocks

Browse Source
This commit is contained in:
Sidney Just 2022-03-03 17:05:05 -08:00
parent 44a5aea4ef
commit 7b9c21f1fe
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/vk_mem_alloc.h
View File

@ -10909,6 +10909,7 @@ public:
size_t GetBlockCount() const { return m_Blocks.size(); } size_t GetBlockCount() const { return m_Blocks.size(); }
// To be used only while the m_Mutex is locked. Used during defragmentation. // To be used only while the m_Mutex is locked. Used during defragmentation.
VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; } VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; }
VMA_RW_MUTEX &GetMutex() { return m_Mutex; }
VkResult CreateMinBlocks(); VkResult CreateMinBlocks();
void AddStatistics(VmaStatistics& inoutStats); void AddStatistics(VmaStatistics& inoutStats);
@ -13064,6 +13065,8 @@ VkResult VmaDefragmentationContext_T::DefragmentPassBegin(VmaDefragmentationPass
{ {
if (m_PoolBlockVector != VMA_NULL) if (m_PoolBlockVector != VMA_NULL)
{ {
VmaMutexLockWrite lock(m_PoolBlockVector->GetMutex(), m_PoolBlockVector->GetAllocator()->m_UseMutex);
if (m_PoolBlockVector->GetBlockCount() > 1) if (m_PoolBlockVector->GetBlockCount() > 1)
ComputeDefragmentation(*m_PoolBlockVector, 0); ComputeDefragmentation(*m_PoolBlockVector, 0);
else if (m_PoolBlockVector->GetBlockCount() == 1) else if (m_PoolBlockVector->GetBlockCount() == 1)
@ -13075,6 +13078,8 @@ VkResult VmaDefragmentationContext_T::DefragmentPassBegin(VmaDefragmentationPass
{ {
if (m_pBlockVectors[i] != VMA_NULL) if (m_pBlockVectors[i] != VMA_NULL)
{ {
VmaMutexLockWrite lock(m_pBlockVectors[i]->GetMutex(), m_pBlockVectors[i]->GetAllocator()->m_UseMutex);
if (m_pBlockVectors[i]->GetBlockCount() > 1) if (m_pBlockVectors[i]->GetBlockCount() > 1)
{ {
if (ComputeDefragmentation(*m_pBlockVectors[i], i)) if (ComputeDefragmentation(*m_pBlockVectors[i], i))