commit 5a8c6b47d88762b39955343ee33c2ef94959b49a
author Adam Sawicki <Adam.Sawicki@amd.com> Mon Feb 25 11:32:48 2019 +0100
committer Adam Sawicki <Adam.Sawicki@amd.com> Mon Feb 25 11:32:48 2019 +0100
tree 6e57ca4bf9eb1f2a3c166b90c4dad91c954036bd
parent ce7351bb16e3a6862c382b474f1dd892e4a8fc8a

Changed syntax used in VmaAllocator_T::ImportVulkanFunctions to please some compiler on Android. #56 Thanks @renelindsay !

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 914399a..9d4a3ce 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -14289,23 +14289,23 @@
 void VmaAllocator_T::ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions)

 {

 #if VMA_STATIC_VULKAN_FUNCTIONS == 1

-    m_VulkanFunctions.vkGetPhysicalDeviceProperties = &vkGetPhysicalDeviceProperties;

-    m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = &vkGetPhysicalDeviceMemoryProperties;

-    m_VulkanFunctions.vkAllocateMemory = &vkAllocateMemory;

-    m_VulkanFunctions.vkFreeMemory = &vkFreeMemory;

-    m_VulkanFunctions.vkMapMemory = &vkMapMemory;

-    m_VulkanFunctions.vkUnmapMemory = &vkUnmapMemory;

-    m_VulkanFunctions.vkFlushMappedMemoryRanges = &vkFlushMappedMemoryRanges;

-    m_VulkanFunctions.vkInvalidateMappedMemoryRanges = &vkInvalidateMappedMemoryRanges;

-    m_VulkanFunctions.vkBindBufferMemory = &vkBindBufferMemory;

-    m_VulkanFunctions.vkBindImageMemory = &vkBindImageMemory;

-    m_VulkanFunctions.vkGetBufferMemoryRequirements = &vkGetBufferMemoryRequirements;

-    m_VulkanFunctions.vkGetImageMemoryRequirements = &vkGetImageMemoryRequirements;

-    m_VulkanFunctions.vkCreateBuffer = &vkCreateBuffer;

-    m_VulkanFunctions.vkDestroyBuffer = &vkDestroyBuffer;

-    m_VulkanFunctions.vkCreateImage = &vkCreateImage;

-    m_VulkanFunctions.vkDestroyImage = &vkDestroyImage;

-    m_VulkanFunctions.vkCmdCopyBuffer = &vkCmdCopyBuffer;

+    m_VulkanFunctions.vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)vkGetPhysicalDeviceProperties;

+    m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)vkGetPhysicalDeviceMemoryProperties;

+    m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory;

+    m_VulkanFunctions.vkFreeMemory = (PFN_vkFreeMemory)vkFreeMemory;

+    m_VulkanFunctions.vkMapMemory = (PFN_vkMapMemory)vkMapMemory;

+    m_VulkanFunctions.vkUnmapMemory = (PFN_vkUnmapMemory)vkUnmapMemory;

+    m_VulkanFunctions.vkFlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges)vkFlushMappedMemoryRanges;

+    m_VulkanFunctions.vkInvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges)vkInvalidateMappedMemoryRanges;

+    m_VulkanFunctions.vkBindBufferMemory = (PFN_vkBindBufferMemory)vkBindBufferMemory;

+    m_VulkanFunctions.vkBindImageMemory = (PFN_vkBindImageMemory)vkBindImageMemory;

+    m_VulkanFunctions.vkGetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)vkGetBufferMemoryRequirements;

+    m_VulkanFunctions.vkGetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements)vkGetImageMemoryRequirements;

+    m_VulkanFunctions.vkCreateBuffer = (PFN_vkCreateBuffer)vkCreateBuffer;

+    m_VulkanFunctions.vkDestroyBuffer = (PFN_vkDestroyBuffer)vkDestroyBuffer;

+    m_VulkanFunctions.vkCreateImage = (PFN_vkCreateImage)vkCreateImage;

+    m_VulkanFunctions.vkDestroyImage = (PFN_vkDestroyImage)vkDestroyImage;

+    m_VulkanFunctions.vkCmdCopyBuffer = (PFN_vkCmdCopyBuffer)vkCmdCopyBuffer;

 #if VMA_DEDICATED_ALLOCATION

     if(m_UseKhrDedicatedAllocation)

     {