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

Implemented VmaBlockMetadata_Buddy::GetSumFreeSize.

Browse Source
This commit is contained in:
Adam Sawicki 2018-09-07 15:05:02 +02:00
parent 8796504f62
commit a7863d9664
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Tests.cpp
View File

@ -4149,7 +4149,7 @@ void Test()
{ {
wprintf(L"TESTING:\n"); wprintf(L"TESTING:\n");
if(false) if(true)
{ {
// # Temporarily insert custom tests here // # Temporarily insert custom tests here
// ######################################## // ########################################

21
src/vk_mem_alloc.h
View File

@ -4956,7 +4956,7 @@ public:
virtual bool Validate() const; virtual bool Validate() const;
virtual size_t GetAllocationCount() const { return m_AllocationCount; } virtual size_t GetAllocationCount() const { return m_AllocationCount; }
virtual VkDeviceSize GetSumFreeSize() const; virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; }
virtual VkDeviceSize GetUnusedRangeSizeMax() const; virtual VkDeviceSize GetUnusedRangeSizeMax() const;
virtual bool IsEmpty() const { return m_Root->type == Node::TYPE_FREE; } virtual bool IsEmpty() const { return m_Root->type == Node::TYPE_FREE; }
@ -5004,9 +5004,11 @@ private:
struct ValidationContext struct ValidationContext
{ {
size_t calculatedAllocationCount; size_t calculatedAllocationCount;
VkDeviceSize calculatedSumFreeSize;
ValidationContext() : ValidationContext() :
calculatedAllocationCount(0) { } calculatedAllocationCount(0),
calculatedSumFreeSize(0) { }
}; };
struct Node struct Node
@ -5047,6 +5049,7 @@ private:
} m_FreeList[MAX_LEVELS]; } m_FreeList[MAX_LEVELS];
// Number of nodes in the tree with type == TYPE_ALLOCATION. // Number of nodes in the tree with type == TYPE_ALLOCATION.
size_t m_AllocationCount; size_t m_AllocationCount;
VkDeviceSize m_SumFreeSize;
void DeleteNode(Node* node); void DeleteNode(Node* node);
bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const; bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const;
@ -9169,7 +9172,8 @@ void VmaBlockMetadata_Linear::CleanupAfterFree()
VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator) : VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator) :
m_Root(VMA_NULL), m_Root(VMA_NULL),
m_AllocationCount(0) m_AllocationCount(0),
m_SumFreeSize(0)
{ {
memset(m_FreeList, 0, sizeof(m_FreeList)); memset(m_FreeList, 0, sizeof(m_FreeList));
} }
@ -9183,6 +9187,8 @@ void VmaBlockMetadata_Buddy::Init(VkDeviceSize size)
{ {
VmaBlockMetadata::Init(size); VmaBlockMetadata::Init(size);
m_SumFreeSize = size;
Node* rootNode = new Node(); Node* rootNode = new Node();
rootNode->offset = 0; rootNode->offset = 0;
rootNode->type = Node::TYPE_FREE; rootNode->type = Node::TYPE_FREE;
@ -9202,6 +9208,7 @@ bool VmaBlockMetadata_Buddy::Validate() const
VMA_VALIDATE(false && "ValidateNode failed."); VMA_VALIDATE(false && "ValidateNode failed.");
} }
VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount); VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount);
VMA_VALIDATE(m_SumFreeSize == ctx.calculatedSumFreeSize);
// Validate free node lists. // Validate free node lists.
for(uint32_t level = 0; level < MAX_LEVELS; ++level) for(uint32_t level = 0; level < MAX_LEVELS; ++level)
@ -9229,11 +9236,6 @@ bool VmaBlockMetadata_Buddy::Validate() const
return true; return true;
} }
VkDeviceSize VmaBlockMetadata_Buddy::GetSumFreeSize() const
{
return 0; // TODO
}
VkDeviceSize VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy::GetUnusedRangeSizeMax() const VkDeviceSize VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy::GetUnusedRangeSizeMax() const
{ {
return 0; // TODO return 0; // TODO
@ -9387,6 +9389,7 @@ void VmaBlockMetadata_Buddy::Alloc(
currNode->allocation.alloc = hAllocation; currNode->allocation.alloc = hAllocation;
++m_AllocationCount; ++m_AllocationCount;
m_SumFreeSize -= LevelToNodeSize(currLevel);
} }
void VmaBlockMetadata_Buddy::DeleteNode(Node* node) void VmaBlockMetadata_Buddy::DeleteNode(Node* node)
@ -9409,6 +9412,7 @@ bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* pa
{ {
case Node::TYPE_FREE: case Node::TYPE_FREE:
// curr->free.prev, next are validated separately. // curr->free.prev, next are validated separately.
ctx.calculatedSumFreeSize += levelNodeSize;
break; break;
case Node::TYPE_ALLOCATION: case Node::TYPE_ALLOCATION:
++ctx.calculatedAllocationCount; ++ctx.calculatedAllocationCount;
@ -9493,6 +9497,7 @@ void VmaBlockMetadata_Buddy::FreeAtOffset(VmaAllocation alloc, VkDeviceSize offs
VMA_ASSERT(alloc == VK_NULL_HANDLE || node->allocation.alloc == alloc); VMA_ASSERT(alloc == VK_NULL_HANDLE || node->allocation.alloc == alloc);
--m_AllocationCount; --m_AllocationCount;
m_SumFreeSize += levelSize;
node->type = Node::TYPE_FREE; node->type = Node::TYPE_FREE;