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

Merge pull request #6 from DustinHLand/master

Browse Source 
Fill out the VmaAllocationInfo parameter passed to vmaAllocateX.
This commit is contained in:
Adam Sawicki 2017-08-14 11:37:06 +02:00 committed by GitHub
commit 93e957055b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/vk_mem_alloc.h
View File

@ -5112,16 +5112,18 @@ VkResult vmaAllocateMemory(
VMA_DEBUG_GLOBAL_MUTEX_LOCK
return allocator->AllocateMemory(
VkResult result = allocator->AllocateMemory(
*pVkMemoryRequirements,
*pVmaMemoryRequirements,
VMA_SUBALLOCATION_TYPE_UNKNOWN,
pAllocation);
if(pAllocationInfo)
if(pAllocationInfo && result == VK_SUCCESS)
{
allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
}
return result;
}
VkResult vmaAllocateMemoryForBuffer(
@ -5140,16 +5142,18 @@ VkResult vmaAllocateMemoryForBuffer(
VkMemoryRequirements vkMemReq = {};
vkGetBufferMemoryRequirements(allocator->m_hDevice, buffer, &vkMemReq);
return allocator->AllocateMemory(
VkResult result = allocator->AllocateMemory(
vkMemReq,
*pMemoryRequirements,
VMA_SUBALLOCATION_TYPE_BUFFER,
pAllocation);
if(pAllocationInfo)
if(pAllocationInfo && result == VK_SUCCESS)
{
allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
}
return result;
}
VkResult vmaAllocateMemoryForImage(
@ -5165,17 +5169,19 @@ VkResult vmaAllocateMemoryForImage(
VMA_DEBUG_GLOBAL_MUTEX_LOCK
return AllocateMemoryForImage(
VkResult result = AllocateMemoryForImage(
allocator,
image,
pMemoryRequirements,
VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN,
pAllocation);
if(pAllocationInfo)
if(pAllocationInfo && result == VK_SUCCESS)
{
allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
}
return result;
}
void vmaFreeMemory(