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

Implemented vmaClearVirtualBlock

Browse Source
This commit is contained in:
Adam Sawicki 2021-10-28 16:03:09 +02:00
parent 9a091e8ccb
commit cc61fe10d8
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/vk_mem_alloc.h
View File

@ -7767,13 +7767,10 @@ void VmaBlockMetadata_Generic::Init(VkDeviceSize size)
suballoc.offset = 0; suballoc.offset = 0;
suballoc.size = size; suballoc.size = size;
suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
suballoc.userData = VMA_NULL;
VMA_ASSERT(size > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER); VMA_ASSERT(size > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER);
m_Suballocations.push_back(suballoc); m_Suballocations.push_back(suballoc);
VmaSuballocationList::iterator suballocItem = m_Suballocations.end(); m_FreeSuballocationsBySize.push_back(m_Suballocations.begin());
--suballocItem;
m_FreeSuballocationsBySize.push_back(suballocItem);
} }
bool VmaBlockMetadata_Generic::Validate() const bool VmaBlockMetadata_Generic::Validate() const
@ -8288,7 +8285,22 @@ void VmaBlockMetadata_Generic::GetAllocationInfo(VkDeviceSize offset, VmaVirtual
void VmaBlockMetadata_Generic::Clear() void VmaBlockMetadata_Generic::Clear()
{ {
VMA_ASSERT(0 && "TODO implement"); const VkDeviceSize size = GetSize();
VMA_ASSERT(IsVirtual());
m_FreeCount = 1;
m_SumFreeSize = size;
m_Suballocations.clear();
m_FreeSuballocationsBySize.clear();
VmaSuballocation suballoc = {};
suballoc.offset = 0;
suballoc.size = size;
suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
m_Suballocations.push_back(suballoc);
VMA_ASSERT(size > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER);
m_FreeSuballocationsBySize.push_back(m_Suballocations.begin());
} }
void VmaBlockMetadata_Generic::SetAllocationUserData(VkDeviceSize offset, void* userData) void VmaBlockMetadata_Generic::SetAllocationUserData(VkDeviceSize offset, void* userData)

21
src/Tests.cpp
View File

@ -2799,9 +2799,24 @@ static void TestVirtualBlocks()
// # Final cleanup // # Final cleanup
vmaVirtualFree(block, alloc2Offset); vmaVirtualFree(block, alloc2Offset);
//vmaClearVirtualBlock(block);
vmaDestroyVirtualBlock(block); vmaDestroyVirtualBlock(block);
{
// Another virtual block, using Clear this time.
TEST(vmaCreateVirtualBlock(&blockCreateInfo, &block) == VK_SUCCESS);
allocCreateInfo = VmaVirtualAllocationCreateInfo{};
allocCreateInfo.size = MEGABYTE;
for(size_t i = 0; i < 8; ++i)
{
VkDeviceSize offset = 0;
TEST(vmaVirtualAllocate(block, &allocCreateInfo, &offset) == VK_SUCCESS);
}
vmaClearVirtualBlock(block);
vmaDestroyVirtualBlock(block);
}
} }
static void TestAllocationVersusResourceSize() static void TestAllocationVersusResourceSize()
@ -6679,7 +6694,7 @@ void Test()
{ {
wprintf(L"TESTING:\n"); wprintf(L"TESTING:\n");
if(true) if(false)
{ {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Temporarily insert custom tests here: // Temporarily insert custom tests here: