[PATCH 4/6] winevulkan: Use a single allocation for device and queues.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winevulkan/vulkan.c         | 25 +++++------------
 dlls/winevulkan/vulkan_private.h | 46 +++++++++++++++++---------------
 2 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 9631b3a0eab..66821ce18f4 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -781,7 +781,7 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre
     struct wine_queue *next_queue;
     struct conversion_context ctx;
     struct wine_device *object;
-    unsigned int i;
+    unsigned int queue_count, i;
     VkResult res;

if (allocator)
@@ -798,7 +798,11 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre
         TRACE("Driver version: %#x.\n", properties.driverVersion);
     }

-    if (!(object = calloc(1, sizeof(*object))))
+    /* We need to cache all queues within the device as each requires wrapping since queues are dispatchable objects. */
+    for (queue_count = 0, i = 0; i < create_info->queueCreateInfoCount; i++)
+        queue_count += create_info->pQueueCreateInfos[i].queueCount;
+
+    if (!(object = calloc(1, offsetof(struct wine_device, queues[queue_count]))))
         return VK_ERROR_OUT_OF_HOST_MEMORY;

object->phys_dev = phys_dev;
@@ -826,21 +830,6 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre
     ALL_VK_DEVICE_FUNCS()
 #undef USE_VK_FUNC

-    /* We need to cache all queues within the device as each requires wrapping since queues are
-     * dispatchable objects.
-     */
-    for (i = 0; i < create_info_host.queueCreateInfoCount; i++)
-    {
-        object->queue_count += create_info_host.pQueueCreateInfos[i].queueCount;
-    }
-
-    if (!(object->queues = calloc(object->queue_count, sizeof(*object->queues))))
-    {
-        object->funcs.p_vkDestroyDevice(object->host_device, NULL /* pAllocator */);
-        free(object);
-        return VK_ERROR_OUT_OF_HOST_MEMORY;
-    }
-
     next_queue = object->queues;
     queue_handles = device_handle->queues;
     for (i = 0; i < create_info_host.queueCreateInfoCount; i++)
@@ -854,6 +843,7 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre
         wine_vk_device_get_queues(object, family_index, queue_count, flags, next_queue, &queue_handles);
         next_queue += queue_count;
     }
+    object->queue_count = next_queue - object->queues;

device_handle->quirks = instance->quirks;
     device_handle->base.unix_handle = (uintptr_t)object;
@@ -973,7 +963,6 @@ void wine_vkDestroyDevice(VkDevice handle, const VkAllocationCallbacks *allocato
     remove_handle_mapping(device->phys_dev->instance, &device->wrapper_entry);

device->funcs.p_vkDestroyDevice(device->host_device, NULL /* pAllocator */);
-    free(device->queues);
     free(device);
 }

diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index 7b1e24f3e56..31e9e981168 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -55,6 +55,25 @@ static inline struct wine_cmd_buffer *wine_cmd_buffer_from_handle(VkCommandBuffe
     return (struct wine_cmd_buffer *)(uintptr_t)handle->base.unix_handle;
 }

+struct wine_queue
+{
+    struct wine_device *device; /* parent */
+
+    VkQueue handle; /* client queue */
+    VkQueue host_queue;
+
+    uint32_t family_index;
+    uint32_t queue_index;
+    VkDeviceQueueCreateFlags flags;
+
+    struct wrapper_entry wrapper_entry;
+};
+
+static inline struct wine_queue *wine_queue_from_handle(VkQueue handle)
+{
+    return (struct wine_queue *)(uintptr_t)handle->base.unix_handle;
+}
+
 struct wine_device
 {
     struct vulkan_device_funcs funcs;
@@ -63,12 +82,14 @@ struct wine_device
     VkDevice handle; /* client device */
     VkDevice host_device;

-    struct wine_queue *queues;
-    uint32_t queue_count;
-
     struct wrapper_entry wrapper_entry;
+
+    uint32_t queue_count;
+    struct wine_queue queues[];
 };

+C_ASSERT(sizeof(struct wine_device) == offsetof(struct wine_device, queues[0]));
+
 static inline struct wine_device *wine_device_from_handle(VkDevice handle)
 {
     return (struct wine_device *)(uintptr_t)handle->base.unix_handle;
@@ -143,25 +164,6 @@ static inline struct wine_phys_dev *wine_phys_dev_from_handle(VkPhysicalDevice h
     return (struct wine_phys_dev *)(uintptr_t)handle->base.unix_handle;
 }

-struct wine_queue
-{
-    struct wine_device *device; /* parent */
-
-    VkQueue handle; /* client queue */
-    VkQueue host_queue;
-
-    uint32_t family_index;
-    uint32_t queue_index;
-    VkDeviceQueueCreateFlags flags;
-
-    struct wrapper_entry wrapper_entry;
-};
-
-static inline struct wine_queue *wine_queue_from_handle(VkQueue handle)
-{
-    return (struct wine_queue *)(uintptr_t)handle->base.unix_handle;
-}
-
 struct wine_cmd_pool
 {
     VkCommandPool handle;