Jacek Caban : winevulkan: Use handle map for memory objects.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 64914849ac42cebd6d6f6b88ae8b16d22e493184
URL:    https://gitlab.winehq.org/wine/wine/-/commit/64914849ac42cebd6d6f6b88ae8b16d...

Author: Jacek Caban 
Date:   Wed Feb 21 14:48:13 2024 +0100

winevulkan: Use handle map for memory objects.

---

dlls/winevulkan/vulkan.c         | 2 ++
 dlls/winevulkan/vulkan_private.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 9d7498d8803..673a982548d 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1703,6 +1703,7 @@ VkResult wine_vkAllocateMemory(VkDevice handle, const VkMemoryAllocateInfo *allo
         return result;
     }

+    WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, memory, memory->host_memory, memory);
     memory->vm_map = mapping;
     *ret = (VkDeviceMemory)(uintptr_t)memory;
     return VK_SUCCESS;
@@ -1717,6 +1718,7 @@ void wine_vkFreeMemory(VkDevice handle, VkDeviceMemory memory_handle, const VkAl
         return;
     memory = wine_device_memory_from_handle(memory_handle);

+    WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, memory);
     device->funcs.p_vkFreeMemory(device->host_device, memory->host_memory, NULL);

if (memory->vm_map)
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index 8ef065ac514..fd5d58870cc 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -176,6 +176,8 @@ struct wine_device_memory
 {
     VkDeviceMemory host_memory;
     void *vm_map;
+
+    struct wine_vk_mapping mapping;
 };

static inline struct wine_device_memory *wine_device_memory_from_handle(VkDeviceMemory handle)