Merge remote-tracking branch 'origin/master'

This commit is contained in:
Adam Sawicki 2019-06-03 10:58:38 +02:00
commit 6da74efe0d

View File

@ -15591,7 +15591,7 @@ uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const
uint32_t memoryTypeBits = 0; uint32_t memoryTypeBits = 0;
// Create buffer. // Create buffer.
VkBuffer buf = VMA_NULL; VkBuffer buf = VK_NULL_HANDLE;
VkResult res = (*GetVulkanFunctions().vkCreateBuffer)( VkResult res = (*GetVulkanFunctions().vkCreateBuffer)(
m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf); m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf);
if(res == VK_SUCCESS) if(res == VK_SUCCESS)