eden-emu/VulkanMemoryAllocator
15
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2025-06-04 19:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Adam Sawicki 2022-01-20 17:02:00 +01:00
commit 2ae5466b2e
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/vk_mem_alloc.h
View file

@ -1613,7 +1613,7 @@ become outdated.
*/ */
VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets( VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(
VmaAllocator VMA_NOT_NULL allocator, VmaAllocator VMA_NOT_NULL allocator,
VmaBudget* VMA_NOT_NULL pBudgets); VmaBudget* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL("VkPhysicalDeviceMemoryProperties::memoryHeapCount") pBudgets);
/** @} */ /** @} */
@ -3551,6 +3551,7 @@ static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char
return VMA_NULL; return VMA_NULL;
} }
#if VMA_STATS_STRING_ENABLED
static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr, size_t strLen) static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr, size_t strLen)
{ {
if (srcStr != VMA_NULL) if (srcStr != VMA_NULL)
@ -3562,6 +3563,7 @@ static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char
} }
return VMA_NULL; return VMA_NULL;
} }
#endif // VMA_STATS_STRING_ENABLED
static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str) static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str)
{ {