mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-09-20 14:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Adam Sawicki 2018-09-07 12:36:38 +02:00
parent 24c4f45abf
commit a70e05dbc5
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/VmaReplay/VmaUsage.h
View File

@ -9,7 +9,7 @@
//#define VMA_USE_STL_CONTAINERS 1 //#define VMA_USE_STL_CONTAINERS 1
//#define VMA_HEAVY_ASSERT(expr) assert(expr) #define VMA_HEAVY_ASSERT(expr) assert(expr)
//#define VMA_DEDICATED_ALLOCATION 0 //#define VMA_DEDICATED_ALLOCATION 0

36
src/vk_mem_alloc.h
View File

@ -4942,7 +4942,7 @@ public:
virtual size_t GetAllocationCount() const; virtual size_t GetAllocationCount() const;
virtual VkDeviceSize GetSumFreeSize() const; virtual VkDeviceSize GetSumFreeSize() const;
virtual VkDeviceSize GetUnusedRangeSizeMax() const; virtual VkDeviceSize GetUnusedRangeSizeMax() const;
virtual bool IsEmpty() const; virtual bool IsEmpty() const { return m_Root->type == Node::TYPE_FREE; }
virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const; virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
virtual void AddPoolStats(VmaPoolStats& inoutStats) const; virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
@ -4979,8 +4979,8 @@ public:
bool upperAddress, bool upperAddress,
VmaAllocation hAllocation); VmaAllocation hAllocation);
virtual void Free(const VmaAllocation allocation); virtual void Free(const VmaAllocation allocation) { FreeAtOffset(allocation, allocation->GetOffset()); }
virtual void FreeAtOffset(VkDeviceSize offset); virtual void FreeAtOffset(VkDeviceSize offset) { FreeAtOffset(VMA_NULL, offset); }
private: private:
static const size_t MAX_LEVELS = 30; // TODO static const size_t MAX_LEVELS = 30; // TODO
@ -4997,6 +4997,7 @@ private:
} type; } type;
Node* parent; Node* parent;
Node* buddy; Node* buddy;
union union
{ {
struct struct
@ -9351,11 +9352,6 @@ VkDeviceSize VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy::GetUnusedRangeSizeM
return 0; // TODO return 0; // TODO
} }
bool VmaBlockMetadata_Buddy::IsEmpty() const
{
return m_Root->type == Node::TYPE_FREE;
}
void VmaBlockMetadata_Buddy::CalcAllocationStatInfo(VmaStatInfo& outInfo) const void VmaBlockMetadata_Buddy::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
{ {
outInfo.blockCount = 1; outInfo.blockCount = 1;
@ -9509,16 +9505,6 @@ void VmaBlockMetadata_Buddy::Alloc(
currNode->allocation.alloc = hAllocation; currNode->allocation.alloc = hAllocation;
} }
void VmaBlockMetadata_Buddy::Free(const VmaAllocation allocation)
{
FreeAtOffset(allocation, allocation->GetOffset());
}
void VmaBlockMetadata_Buddy::FreeAtOffset(VkDeviceSize offset)
{
FreeAtOffset(VMA_NULL, offset);
}
void VmaBlockMetadata_Buddy::DeleteNode(Node* node) void VmaBlockMetadata_Buddy::DeleteNode(Node* node)
{ {
if(node->type == Node::TYPE_SPLIT) if(node->type == Node::TYPE_SPLIT)
@ -9547,6 +9533,7 @@ bool VmaBlockMetadata_Buddy::ValidateNode(const Node* parent, const Node* curr,
switch(curr->type) switch(curr->type)
{ {
case Node::TYPE_FREE: case Node::TYPE_FREE:
// curr->free.prev, next are validated separately.
break; break;
case Node::TYPE_ALLOCATION: case Node::TYPE_ALLOCATION:
if(curr->allocation.alloc == VK_NULL_HANDLE) if(curr->allocation.alloc == VK_NULL_HANDLE)
@ -9619,20 +9606,23 @@ void VmaBlockMetadata_Buddy::FreeAtOffset(VmaAllocation alloc, VkDeviceSize offs
{ {
// Find node and level. // Find node and level.
Node* node = m_Root; Node* node = m_Root;
VkDeviceSize nodeOffset = 0;
uint32_t level = 0; uint32_t level = 0;
VkDeviceSize levelSize = GetSize();
while(node->type == Node::TYPE_SPLIT) while(node->type == Node::TYPE_SPLIT)
{ {
Node* leftChild = node->split.leftChild; const VkDeviceSize nextLevelSize = levelSize / 2;
Node* rightChild = leftChild->buddy; if(offset < nodeOffset + nextLevelSize)
if(offset < rightChild->offset) // TODO could be calculated
{ {
node = leftChild; node = node->split.leftChild;
} }
else else
{ {
node = rightChild; node = node->split.leftChild->buddy;
nodeOffset += nextLevelSize;
} }
++level; ++level;
levelSize = nextLevelSize;
} }
VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION); VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION);