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

Small fix in VmaBlock::Free (thanks @dylanede for pointing this!)

Browse Source
This commit is contained in:
Adam Sawicki 2017-07-11 15:25:19 +02:00
parent 7600059ae7
commit 0845f1c2e5
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/vk_mem_alloc.h
View File

@ -2653,41 +2653,19 @@ void VmaAllocation::FreeSuballocation(VmaSuballocationList::iterator suballocIte
void VmaAllocation::Free(const VkMappedMemoryRange* pMemory) void VmaAllocation::Free(const VkMappedMemoryRange* pMemory)
{ {
// If suballocation to free has offset smaller than half of allocation size, search forward. for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin();
// Otherwise search backward. suballocItem != m_Suballocations.end();
const bool forwardDirection = pMemory->offset < (m_Size / 2); ++suballocItem)
if(forwardDirection)
{ {
for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin(); VmaSuballocation& suballoc = *suballocItem;
suballocItem != m_Suballocations.end(); if(suballoc.offset == pMemory->offset)
++suballocItem)
{ {
VmaSuballocation& suballoc = *suballocItem; FreeSuballocation(suballocItem);
if(suballoc.offset == pMemory->offset) VMA_HEAVY_ASSERT(Validate());
{ return;
FreeSuballocation(suballocItem);
VMA_HEAVY_ASSERT(Validate());
return;
}
} }
VMA_ASSERT(0 && "Not found!");
}
else
{
for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin();
suballocItem != m_Suballocations.end();
++suballocItem)
{
VmaSuballocation& suballoc = *suballocItem;
if(suballoc.offset == pMemory->offset)
{
FreeSuballocation(suballocItem);
VMA_HEAVY_ASSERT(Validate());
return;
}
}
VMA_ASSERT(0 && "Not found!");
} }
VMA_ASSERT(0 && "Not found!");
} }
#if VMA_STATS_STRING_ENABLED #if VMA_STATS_STRING_ENABLED