Added missing mutex lock in VmaDefragmentationContext_T::DefragmentPassEnd

reg-pl · reg-pl · commit c3c7a2c073c3 · 2026-05-16T15:52:20.000+02:00
As proposed by @JustSid in GPUOpen-LibrariesAndSDKs#313
diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h
@@ -12377,7 +12377,11 @@ VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMo
         {
         case VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY:
         {
-            uint8_t mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation);
+            uint8_t mapCount = 0;
+            {
+                VmaMutexLockWrite swapLock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);
+                mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation);
+            }
             if (mapCount > 0)
             {
                 allocator = vector->m_hAllocator;

Original file line number	Diff line number	Diff line change
`@@ -12377,7 +12377,11 @@ VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMo`
`12377`	`12377`	`{`
`12378`	`12378`	`case VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY:`
`12379`	`12379`	`{`
`12380`		`- uint8_t mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation);`
	`12380`	`+ uint8_t mapCount = 0;`
	`12381`	`+ {`
	`12382`	`+ VmaMutexLockWrite swapLock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);`
	`12383`	`+ mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation);`
	`12384`	`+ }`
`12381`	`12385`	`if (mapCount > 0)`
`12382`	`12386`	`{`
`12383`	`12387`	`allocator = vector->m_hAllocator;`