commit f8b70f0542aeca01d7ac3a06c5f73a635aff8bea
author Adam Sawicki <adam.sawicki@amd.com> Tue Sep 26 13:57:59 2017 +0200
committer GitHub <noreply@github.com> Tue Sep 26 13:57:59 2017 +0200
tree f256505c3b0245065c514f757687ffea6796bd59
parent 25c44a9320b51a66aeb0c97a43689f4a7ee77e4f
parent b19740c4e5c093616d722b095a4b6e6fa110f916

Merge pull request #13 from realitix/missing_vulkan_function

Fix vulkan calls

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 686d193..d0a5896 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -6401,7 +6401,13 @@
     {

         if(m_UnmapPersistentlyMappedMemoryCounter == 0)

         {

-            res = vkMapMemory(m_hDevice, hMemory, 0, VK_WHOLE_SIZE, 0, &pMappedData);

+            res = (*this->GetVulkanFunctions().vkMapMemory)(

+                m_hDevice,

+                hMemory,

+                0,

+                VK_WHOLE_SIZE,

+                0,

+                &pMappedData);

             if(res < 0)

             {

                 VMA_DEBUG_LOG("    vkMapMemory FAILED");

@@ -7015,7 +7021,7 @@
     

     if(allocation->GetMappedData() != VMA_NULL)

     {

-        vkUnmapMemory(m_hDevice, hMemory);

+        (*this->GetVulkanFunctions().vkUnmapMemory)(m_hDevice, hMemory);

     }

     

     FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory);

@@ -7616,8 +7622,13 @@
 

     VMA_DEBUG_GLOBAL_MUTEX_LOCK

 

-    return vkMapMemory(allocator->m_hDevice, allocation->GetMemory(),

-        allocation->GetOffset(), allocation->GetSize(), 0, ppData);

+    return (*allocator->GetVulkanFunctions().vkMapMemory)(

+        allocator->m_hDevice,

+        allocation->GetMemory(),

+        allocation->GetOffset(),

+        allocation->GetSize(),

+        0,

+        ppData);

 }

 

 void vmaUnmapMemory(

@@ -7628,7 +7639,7 @@
 

     VMA_DEBUG_GLOBAL_MUTEX_LOCK

 

-    vkUnmapMemory(allocator->m_hDevice, allocation->GetMemory());

+    (*allocator->GetVulkanFunctions().vkUnmapMemory)(allocator->m_hDevice, allocation->GetMemory());

 }

 

 void vmaUnmapPersistentlyMappedMemory(VmaAllocator allocator)