commit eebf47cd1c215dbcd946b3acb2cce37858e0f6c9
author Nils Petter Skålerud <np_skalerud@hotmail.com> Thu Mar 19 19:20:19 2020 +0100
committer Nils Petter Skålerud <np_skalerud@hotmail.com> Thu Mar 19 19:20:19 2020 +0100
tree 166c13649b857527c5a05cbaf8da57e41fab6b3c
parent 39aeff7a434801c5f8a2432b9544a2165e63e697

Added a member void* pUserData to VmaDeviceMemoryCallbacks
Updated PFN_vmaAllocateDeviceMemoryFunction to use new pUserData member
Updated PFN_vmaFreeDeviceMemoryFunction to use new pUserData member

Signed-off-by: Nils Petter Skålerud <np_skalerud@hotmail.com>

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 6be990a..fd85476 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -1904,13 +1904,15 @@
     VmaAllocator      allocator,

     uint32_t          memoryType,

     VkDeviceMemory    memory,

-    VkDeviceSize      size);

+    VkDeviceSize      size,

+    void* pUserData);

 /// Callback function called before vkFreeMemory.

 typedef void (VKAPI_PTR *PFN_vmaFreeDeviceMemoryFunction)(

     VmaAllocator      allocator,

     uint32_t          memoryType,

     VkDeviceMemory    memory,

-    VkDeviceSize      size);

+    VkDeviceSize      size,

+    void* pUserData);

 

 /** \brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`.

 

@@ -1924,6 +1926,8 @@
     PFN_vmaAllocateDeviceMemoryFunction pfnAllocate;

     /// Optional, can be null.

     PFN_vmaFreeDeviceMemoryFunction pfnFree;

+    /// Optional, can be null.

+    void* pUserData;

 } VmaDeviceMemoryCallbacks;

 

 /// Flags for created #VmaAllocator.

@@ -16363,7 +16367,7 @@
         // Informative callback.

         if(m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL)

         {

-            (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize);

+            (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize, m_DeviceMemoryCallbacks.pUserData);

         }

     }

     else

@@ -16379,7 +16383,7 @@
     // Informative callback.

     if(m_DeviceMemoryCallbacks.pfnFree != VMA_NULL)

     {

-        (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size);

+        (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size, m_DeviceMemoryCallbacks.pUserData);

     }

 

     // VULKAN CALL vkFreeMemory.