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

Deleted calculation of number of vmaCreateAllocator calls, as there is always at most one.

Browse Source
This commit is contained in:
Adam Sawicki 2018-08-20 16:36:07 +02:00
parent 5c49bebe10
commit c49eb6282f
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/VmaReplay/VmaReplay.cpp
View File

@ -244,12 +244,8 @@ public:
size_t GetLinearImageCreationCount() const { return m_LinearImageCreationCount; } size_t GetLinearImageCreationCount() const { return m_LinearImageCreationCount; }
size_t GetBufferCreationCount(uint32_t bufClass) const { return m_BufferCreationCount[bufClass]; } size_t GetBufferCreationCount(uint32_t bufClass) const { return m_BufferCreationCount[bufClass]; }
size_t GetAllocationCreationCount() const { return m_AllocationCreationCount; } size_t GetAllocationCreationCount() const { return m_AllocationCreationCount; }
size_t GetAllocatorCreationCount() const { return m_AllocatorCreationCount; }
size_t GetAllocatorPeakCount() const { return m_AllocatorPeakCount; }
size_t GetPoolCreationCount() const { return m_PoolCreationCount; } size_t GetPoolCreationCount() const { return m_PoolCreationCount; }
void RegisterCreateAllocator();
void RegisterDestroyAllocator();
void RegisterCreateImage(uint32_t usage, uint32_t tiling); void RegisterCreateImage(uint32_t usage, uint32_t tiling);
void RegisterCreateBuffer(uint32_t usage); void RegisterCreateBuffer(uint32_t usage);
void RegisterCreatePool(); void RegisterCreatePool();
@ -260,9 +256,6 @@ private:
size_t m_LinearImageCreationCount = 0; size_t m_LinearImageCreationCount = 0;
size_t m_BufferCreationCount[4] = { }; size_t m_BufferCreationCount[4] = { };
size_t m_AllocationCreationCount = 0; // Also includes buffers and images, and lost allocations. size_t m_AllocationCreationCount = 0; // Also includes buffers and images, and lost allocations.
size_t m_AllocatorCreationCount = 0;
size_t m_AllocatorCurrCount = 0;
size_t m_AllocatorPeakCount = 0;
size_t m_PoolCreationCount = 0; size_t m_PoolCreationCount = 0;
}; };
@ -329,19 +322,6 @@ uint32_t Statistics::ImageUsageToClass(uint32_t usage)
} }
} }
void Statistics::RegisterCreateAllocator()
{
++m_AllocatorCreationCount;
++m_AllocatorCurrCount;
m_AllocatorPeakCount = std::max(m_AllocatorPeakCount, m_AllocatorCurrCount);
}
void Statistics::RegisterDestroyAllocator()
{
if(m_AllocatorCurrCount > 0)
--m_AllocatorCurrCount;
}
void Statistics::RegisterCreateImage(uint32_t usage, uint32_t tiling) void Statistics::RegisterCreateImage(uint32_t usage, uint32_t tiling)
{ {
if(tiling == VK_IMAGE_TILING_LINEAR) if(tiling == VK_IMAGE_TILING_LINEAR)
@ -543,14 +523,6 @@ int Player::Init()
Player::~Player() Player::~Player()
{ {
if(m_Stats.GetAllocatorCreationCount() > 1)
{
printf("WARNING: %zu VmaAllocator objects were created. It is recommended to use just one.\n",
m_Stats.GetAllocatorCreationCount());
printf(" At most %zu allocators existed simultaneously.\n",
m_Stats.GetAllocatorPeakCount());
}
if(g_Verbosity > VERBOSITY::MINIMUM) if(g_Verbosity > VERBOSITY::MINIMUM)
{ {
PrintStats(); PrintStats();
@ -621,14 +593,14 @@ void Player::ExecuteLine(size_t lineNumber, const StrRange& line)
{ {
if(ValidateFunctionParameterCount(lineNumber, csvSplit, 0, false)) if(ValidateFunctionParameterCount(lineNumber, csvSplit, 0, false))
{ {
m_Stats.RegisterCreateAllocator(); // Nothing.
} }
} }
else if(StrRangeEq(functionName, "vmaDestroyAllocator")) else if(StrRangeEq(functionName, "vmaDestroyAllocator"))
{ {
if(ValidateFunctionParameterCount(lineNumber, csvSplit, 0, false)) if(ValidateFunctionParameterCount(lineNumber, csvSplit, 0, false))
{ {
m_Stats.RegisterDestroyAllocator(); // Nothing.
} }
} }
else if(StrRangeEq(functionName, "vmaCreatePool")) else if(StrRangeEq(functionName, "vmaCreatePool"))