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

Split macros into separate VMA_DEBUG_LOG and VMA_DEBUG_LOG_FORMAT

Browse Source 
To fix compiler errors with -Wpedantic -Werror - see #297
This commit is contained in:
Adam Sawicki 2022-11-29 16:16:12 +01:00
parent 3703ef88ff
commit 6d2fe13627
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/vk_mem_alloc.h
View File

@ -2842,16 +2842,20 @@ static void vma_aligned_free(void* VMA_NULLABLE ptr)
#define VMA_SORT(beg, end, cmp) std::sort(beg, end, cmp) #define VMA_SORT(beg, end, cmp) std::sort(beg, end, cmp)
#endif #endif
#ifndef VMA_DEBUG_LOG #ifndef VMA_DEBUG_LOG_FORMAT
#define VMA_DEBUG_LOG(format, ...) #define VMA_DEBUG_LOG_FORMAT(format, ...)
/* /*
#define VMA_DEBUG_LOG(format, ...) do { \ #define VMA_DEBUG_LOG_FORMAT(format, ...) do { \
printf(format, __VA_ARGS__); \ printf((format), __VA_ARGS__); \
printf("\n"); \ printf("\n"); \
} while(false) } while(false)
*/ */
#endif #endif
#ifndef VMA_DEBUG_LOG
#define VMA_DEBUG_LOG(str) VMA_DEBUG_LOG_FORMAT("%s", (str))
#endif
// Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString. // Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.
#if VMA_STATS_STRING_ENABLED #if VMA_STATS_STRING_ENABLED
static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num) static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num)
@ -6409,7 +6413,7 @@ void VmaBlockMetadata::DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size
{ {
if (IsVirtual()) if (IsVirtual())
{ {
VMA_DEBUG_LOG("UNFREED VIRTUAL ALLOCATION; Offset: %llu; Size: %llu; UserData: %p", offset, size, userData); VMA_DEBUG_LOG_FORMAT("UNFREED VIRTUAL ALLOCATION; Offset: %llu; Size: %llu; UserData: %p", offset, size, userData);
} }
else else
{ {
@ -6420,12 +6424,12 @@ void VmaBlockMetadata::DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size
const char* name = allocation->GetName(); const char* name = allocation->GetName();
#if VMA_STATS_STRING_ENABLED #if VMA_STATS_STRING_ENABLED
VMA_DEBUG_LOG("UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %s; Usage: %u", VMA_DEBUG_LOG_FORMAT("UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %s; Usage: %u",
offset, size, userData, name ? name : "vma_empty", offset, size, userData, name ? name : "vma_empty",
VMA_SUBALLOCATION_TYPE_NAMES[allocation->GetSuballocationType()], VMA_SUBALLOCATION_TYPE_NAMES[allocation->GetSuballocationType()],
allocation->GetBufferImageUsage()); allocation->GetBufferImageUsage());
#else #else
VMA_DEBUG_LOG("UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %u", VMA_DEBUG_LOG_FORMAT("UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %u",
offset, size, userData, name ? name : "vma_empty", offset, size, userData, name ? name : "vma_empty",
(uint32_t)allocation->GetSuballocationType()); (uint32_t)allocation->GetSuballocationType());
#endif // VMA_STATS_STRING_ENABLED #endif // VMA_STATS_STRING_ENABLED
@ -11279,7 +11283,7 @@ VmaVirtualBlock_T::VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo
VmaVirtualBlock_T::~VmaVirtualBlock_T() VmaVirtualBlock_T::~VmaVirtualBlock_T()
{ {
// Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations // Define macro VMA_DEBUG_LOG_FORMAT to receive the list of the unfreed allocations
if (!m_Metadata->IsEmpty()) if (!m_Metadata->IsEmpty())
m_Metadata->DebugLogAllAllocations(); m_Metadata->DebugLogAllAllocations();
// This is the most important assert in the entire library. // This is the most important assert in the entire library.
@ -11771,7 +11775,7 @@ void VmaDeviceMemoryBlock::Init(
void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator) void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator)
{ {
// Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations // Define macro VMA_DEBUG_LOG_FORMAT to receive the list of the unfreed allocations
if (!m_pMetadata->IsEmpty()) if (!m_pMetadata->IsEmpty())
m_pMetadata->DebugLogAllAllocations(); m_pMetadata->DebugLogAllAllocations();
// This is the most important assert in the entire library. // This is the most important assert in the entire library.
@ -12479,7 +12483,7 @@ VkResult VmaBlockVector::AllocatePage(
pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);
if (res == VK_SUCCESS) if (res == VK_SUCCESS)
{ {
VMA_DEBUG_LOG(" Returned from last block #%u", pCurrBlock->GetId()); VMA_DEBUG_LOG_FORMAT(" Returned from last block #%u", pCurrBlock->GetId());
IncrementallySortBlocks(); IncrementallySortBlocks();
return VK_SUCCESS; return VK_SUCCESS;
} }
@ -12515,7 +12519,7 @@ VkResult VmaBlockVector::AllocatePage(
pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);
if (res == VK_SUCCESS) if (res == VK_SUCCESS)
{ {
VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); VMA_DEBUG_LOG_FORMAT(" Returned from existing block #%u", pCurrBlock->GetId());
IncrementallySortBlocks(); IncrementallySortBlocks();
return VK_SUCCESS; return VK_SUCCESS;
} }
@ -12534,7 +12538,7 @@ VkResult VmaBlockVector::AllocatePage(
pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);
if (res == VK_SUCCESS) if (res == VK_SUCCESS)
{ {
VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); VMA_DEBUG_LOG_FORMAT(" Returned from existing block #%u", pCurrBlock->GetId());
IncrementallySortBlocks(); IncrementallySortBlocks();
return VK_SUCCESS; return VK_SUCCESS;
} }
@ -12551,7 +12555,7 @@ VkResult VmaBlockVector::AllocatePage(
VkResult res = AllocateFromBlock(pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); VkResult res = AllocateFromBlock(pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);
if (res == VK_SUCCESS) if (res == VK_SUCCESS)
{ {
VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); VMA_DEBUG_LOG_FORMAT(" Returned from existing block #%u", pCurrBlock->GetId());
IncrementallySortBlocks(); IncrementallySortBlocks();
return VK_SUCCESS; return VK_SUCCESS;
} }
@ -12618,7 +12622,7 @@ VkResult VmaBlockVector::AllocatePage(
pBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation); pBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);
if (res == VK_SUCCESS) if (res == VK_SUCCESS)
{ {
VMA_DEBUG_LOG(" Created new block #%u Size=%llu", pBlock->GetId(), newBlockSize); VMA_DEBUG_LOG_FORMAT(" Created new block #%u Size=%llu", pBlock->GetId(), newBlockSize);
IncrementallySortBlocks(); IncrementallySortBlocks();
return VK_SUCCESS; return VK_SUCCESS;
} }
@ -12667,7 +12671,7 @@ void VmaBlockVector::Free(const VmaAllocation hAllocation)
pBlock->PostFree(m_hAllocator); pBlock->PostFree(m_hAllocator);
VMA_HEAVY_ASSERT(pBlock->Validate()); VMA_HEAVY_ASSERT(pBlock->Validate());
VMA_DEBUG_LOG(" Freed from MemoryTypeIndex=%u", m_MemoryTypeIndex); VMA_DEBUG_LOG_FORMAT(" Freed from MemoryTypeIndex=%u", m_MemoryTypeIndex);
const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount; const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount;
// pBlock became empty after this deallocation. // pBlock became empty after this deallocation.
@ -12700,7 +12704,7 @@ void VmaBlockVector::Free(const VmaAllocation hAllocation)
// lock, for performance reason. // lock, for performance reason.
if (pBlockToDelete != VMA_NULL) if (pBlockToDelete != VMA_NULL)
{ {
VMA_DEBUG_LOG(" Deleted empty block #%u", pBlockToDelete->GetId()); VMA_DEBUG_LOG_FORMAT(" Deleted empty block #%u", pBlockToDelete->GetId());
pBlockToDelete->Destroy(m_hAllocator); pBlockToDelete->Destroy(m_hAllocator);
vma_delete(m_hAllocator, pBlockToDelete); vma_delete(m_hAllocator, pBlockToDelete);
} }
@ -14461,7 +14465,7 @@ VkResult VmaAllocator_T::AllocateMemoryOfType(
VmaAllocation* pAllocations) VmaAllocation* pAllocations)
{ {
VMA_ASSERT(pAllocations != VMA_NULL); VMA_ASSERT(pAllocations != VMA_NULL);
VMA_DEBUG_LOG(" AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu", memTypeIndex, allocationCount, size); VMA_DEBUG_LOG_FORMAT(" AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu", memTypeIndex, allocationCount, size);
VmaAllocationCreateInfo finalCreateInfo = createInfo; VmaAllocationCreateInfo finalCreateInfo = createInfo;
VkResult res = CalcMemTypeParams( VkResult res = CalcMemTypeParams(
@ -14706,7 +14710,7 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory(
{ {
dedicatedAllocations.Register(pAllocations[allocIndex]); dedicatedAllocations.Register(pAllocations[allocIndex]);
} }
VMA_DEBUG_LOG(" Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u", allocationCount, memTypeIndex); VMA_DEBUG_LOG_FORMAT(" Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u", allocationCount, memTypeIndex);
} }
else else
{ {
@ -15264,7 +15268,7 @@ void VmaAllocator_T::GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationI
VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool) VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool)
{ {
VMA_DEBUG_LOG(" CreatePool: MemoryTypeIndex=%u, flags=%u", pCreateInfo->memoryTypeIndex, pCreateInfo->flags); VMA_DEBUG_LOG_FORMAT(" CreatePool: MemoryTypeIndex=%u, flags=%u", pCreateInfo->memoryTypeIndex, pCreateInfo->flags);
VmaPoolCreateInfo newCreateInfo = *pCreateInfo; VmaPoolCreateInfo newCreateInfo = *pCreateInfo;
@ -15743,7 +15747,7 @@ void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation)
m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize()); m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize());
m_AllocationObjectAllocator.Free(allocation); m_AllocationObjectAllocator.Free(allocation);
VMA_DEBUG_LOG(" Freed DedicatedMemory MemoryTypeIndex=%u", memTypeIndex); VMA_DEBUG_LOG_FORMAT(" Freed DedicatedMemory MemoryTypeIndex=%u", memTypeIndex);
} }
uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const