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

Add assert to check success of a CPU memory allocation

Browse Source
This commit is contained in:
Adam Sawicki 2020-06-24 17:16:26 +02:00
parent f9921aefdd
commit 1ebda1eecc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vk_mem_alloc.h
View File

@ -1880,6 +1880,7 @@ Features deliberately excluded from the scope of this library:
objects in CPU memory (not Vulkan memory), allocation failures are not checked objects in CPU memory (not Vulkan memory), allocation failures are not checked
and handled gracefully, because that would complicate code significantly and and handled gracefully, because that would complicate code significantly and
is usually not needed in desktop PC applications anyway. is usually not needed in desktop PC applications anyway.
Success of an allocation is just checked with an assert.
- Code free of any compiler warnings. Maintaining the library to compile and - Code free of any compiler warnings. Maintaining the library to compile and
work correctly on so many different platforms is hard enough. Being free of work correctly on so many different platforms is hard enough. Being free of
any warnings, on any version of any compiler, is simply not feasible. any warnings, on any version of any compiler, is simply not feasible.
@ -4626,10 +4627,11 @@ static inline void VmaPnextChainPushFront(MainT* mainStruct, NewT* newStruct)
static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment) static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment)
{ {
void* result = VMA_NULL;
if((pAllocationCallbacks != VMA_NULL) && if((pAllocationCallbacks != VMA_NULL) &&
(pAllocationCallbacks->pfnAllocation != VMA_NULL)) (pAllocationCallbacks->pfnAllocation != VMA_NULL))
{ {
return (*pAllocationCallbacks->pfnAllocation)( result = (*pAllocationCallbacks->pfnAllocation)(
pAllocationCallbacks->pUserData, pAllocationCallbacks->pUserData,
size, size,
alignment, alignment,
@ -4637,8 +4639,10 @@ static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t
} }
else else
{ {
return VMA_SYSTEM_ALIGNED_MALLOC(size, alignment); result = VMA_SYSTEM_ALIGNED_MALLOC(size, alignment);
} }
VMA_ASSERT(result != VMA_NULL && "CPU memory allocation failed.");
return result;
} }
static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr) static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr)