Small fix in VmaAllocator_T::AllocateDedicatedMemory.

This commit is contained in:
Adam Sawicki 2017-10-03 11:32:55 +02:00
parent 358bc78544
commit f72365c0fc

View File

@ -6515,16 +6515,19 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory(
allocInfo.allocationSize = size; allocInfo.allocationSize = size;
VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR }; VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR };
if(dedicatedBuffer != VK_NULL_HANDLE) if(m_UseKhrDedicatedAllocation)
{ {
VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE); if(dedicatedBuffer != VK_NULL_HANDLE)
dedicatedAllocInfo.buffer = dedicatedBuffer; {
allocInfo.pNext = &dedicatedAllocInfo; VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE);
} dedicatedAllocInfo.buffer = dedicatedBuffer;
else if(dedicatedImage != VK_NULL_HANDLE) allocInfo.pNext = &dedicatedAllocInfo;
{ }
dedicatedAllocInfo.image = dedicatedImage; else if(dedicatedImage != VK_NULL_HANDLE)
allocInfo.pNext = &dedicatedAllocInfo; {
dedicatedAllocInfo.image = dedicatedImage;
allocInfo.pNext = &dedicatedAllocInfo;
}
} }
// Allocate VkDeviceMemory. // Allocate VkDeviceMemory.