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

Improvement in function vmaDefragmentationBegin. Added validation of input arrays.

Browse Source
This commit is contained in:
Adam Sawicki 2018-12-10 13:15:43 +01:00
parent a12a7fe43e
commit e31dd15ff5
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/vk_mem_alloc.h
View File

@ -3718,6 +3718,32 @@ static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT &key, Cm
return beg + down; return beg + down;
} }
/*
Returns true if all pointers in the array are not-null and unique.
Warning! O(n^2) complexity. Use only inside VMA_HEAVY_ASSERT.
T must be pointer type, e.g. VmaAllocation, VmaPool.
*/
template<typename T>
static bool VmaValidatePointerArray(uint32_t count, const T* arr)
{
for(uint32_t i = 0; i < count; ++i)
{
const T iPtr = arr[i];
if(iPtr == VMA_NULL)
{
return false;
}
for(uint32_t j = i + 1; j < count; ++j)
{
if(iPtr == arr[j])
{
return false;
}
}
}
return true;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Memory allocation // Memory allocation
@ -16022,8 +16048,17 @@ VkResult vmaDefragmentationBegin(
VmaDefragmentationContext *pContext) VmaDefragmentationContext *pContext)
{ {
VMA_ASSERT(allocator && pInfo && pContext); VMA_ASSERT(allocator && pInfo && pContext);
// Degenerate case: Nothing to defragment.
if(pInfo->allocationCount == 0 && pInfo->poolCount == 0)
{
return VK_SUCCESS;
}
VMA_ASSERT(pInfo->allocationCount == 0 || pInfo->pAllocations != VMA_NULL); VMA_ASSERT(pInfo->allocationCount == 0 || pInfo->pAllocations != VMA_NULL);
VMA_ASSERT(pInfo->poolCount == 0 || pInfo->pPools != VMA_NULL); VMA_ASSERT(pInfo->poolCount == 0 || pInfo->pPools != VMA_NULL);
VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->allocationCount, pInfo->pAllocations));
VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->poolCount, pInfo->pPools));
VMA_DEBUG_LOG("vmaDefragmentationBegin"); VMA_DEBUG_LOG("vmaDefragmentationBegin");