[PATCH 0/2] MR4488: winevulkan: Allocate create info host extensions with malloc.

[Rémi Bernon]

I don't think there's any reason to use the conversion context to allocate this memory, it's briefly used to build the host extension list and released right away.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4488

[PATCH 2/2] winevulkan: Allocate memory for VkInstanceCreateInfo with malloc.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/winevulkan/vulkan.c | 49 ++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 4409d1b0f43..16e1517220b 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -489,15 +489,18 @@ NTSTATUS init_vulkan(void *args)
  * This function takes care of extensions handled at winevulkan layer, a Wine graphics
  * driver is responsible for handling e.g. surface extensions.
  */
-static VkResult wine_vk_instance_convert_create_info(struct conversion_context *ctx,
-        const VkInstanceCreateInfo *src, VkInstanceCreateInfo *dst, struct wine_instance *object)
+static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src,
+        VkInstanceCreateInfo *dst, struct wine_instance *object)
 {
     VkDebugUtilsMessengerCreateInfoEXT *debug_utils_messenger;
     VkDebugReportCallbackCreateInfoEXT *debug_report_callback;
     VkBaseInStructure *header;
+    const char **extensions;
     unsigned int i;
 
     *dst = *src;
+    dst->ppEnabledExtensionNames = NULL;
+    dst->enabledExtensionCount = 0;
 
     object->utils_messenger_count = wine_vk_count_struct(dst, DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT);
     object->utils_messengers =  calloc(object->utils_messenger_count, sizeof(*object->utils_messengers));
@@ -542,10 +545,10 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context *
         return VK_ERROR_LAYER_NOT_PRESENT;
     }
 
-    TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount);
-    for (i = 0; i < dst->enabledExtensionCount; i++)
+    TRACE("Enabled %u instance extensions.\n", src->enabledExtensionCount);
+    for (i = 0; i < src->enabledExtensionCount; i++)
     {
-        const char *extension_name = dst->ppEnabledExtensionNames[i];
+        const char *extension_name = src->ppEnabledExtensionNames[i];
         TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name));
         if (!wine_vk_instance_extension_supported(extension_name))
         {
@@ -558,19 +561,21 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context *
         }
     }
 
-    if (use_external_memory())
+    if (!src->enabledExtensionCount) extensions = NULL;
+    else
     {
-        const char **new_extensions;
+        if (!(extensions = malloc((src->enabledExtensionCount + 2) * sizeof(*extensions)))) return VK_ERROR_OUT_OF_HOST_MEMORY;
+        memcpy(extensions, src->ppEnabledExtensionNames, src->enabledExtensionCount * sizeof(*extensions));
+        dst->enabledExtensionCount = src->enabledExtensionCount;
+    }
 
-        new_extensions = conversion_context_alloc(ctx, (dst->enabledExtensionCount + 2) *
-                                                  sizeof(*dst->ppEnabledExtensionNames));
-        memcpy(new_extensions, src->ppEnabledExtensionNames,
-               dst->enabledExtensionCount * sizeof(*dst->ppEnabledExtensionNames));
-        new_extensions[dst->enabledExtensionCount++] = "VK_KHR_get_physical_device_properties2";
-        new_extensions[dst->enabledExtensionCount++] = "VK_KHR_external_memory_capabilities";
-        dst->ppEnabledExtensionNames = new_extensions;
+    if (use_external_memory())
+    {
+        extensions[dst->enabledExtensionCount++] = "VK_KHR_get_physical_device_properties2";
+        extensions[dst->enabledExtensionCount++] = "VK_KHR_external_memory_capabilities";
     }
 
+    dst->ppEnabledExtensionNames = extensions;
     return VK_SUCCESS;
 }
 
@@ -842,7 +847,6 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
     VkInstance client_instance = client_ptr;
     VkInstanceCreateInfo create_info_host;
     const VkApplicationInfo *app_info;
-    struct conversion_context ctx;
     struct wine_instance *object;
     VkResult res;
 
@@ -857,14 +861,17 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
     list_init(&object->wrappers);
     pthread_rwlock_init(&object->wrapper_lock, NULL);
 
-    init_conversion_context(&ctx);
-    res = wine_vk_instance_convert_create_info(&ctx, create_info, &create_info_host, object);
-    if (res == VK_SUCCESS)
-        res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance);
-    free_conversion_context(&ctx);
+    if ((res = wine_vk_instance_convert_create_info(create_info, &create_info_host, object)) != VK_SUCCESS)
+    {
+        wine_vk_instance_free(object);
+        return res;
+    }
+
+    res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance);
     if (res != VK_SUCCESS)
     {
         ERR("Failed to create instance, res=%d\n", res);
+        free((void *)create_info_host.ppEnabledExtensionNames);
         wine_vk_instance_free(object);
         return res;
     }
@@ -890,6 +897,7 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
     if (res != VK_SUCCESS)
     {
         ERR("Failed to load physical devices, res=%d\n", res);
+        free((void *)create_info_host.ppEnabledExtensionNames);
         wine_vk_instance_free(object);
         return res;
     }
@@ -911,6 +919,7 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
     client_instance->base.unix_handle = (uintptr_t)object;
     *instance = client_instance;
     TRACE("Created instance %p (native instance %p).\n", object, object->instance);
+    free((void *)create_info_host.ppEnabledExtensionNames);
     return VK_SUCCESS;
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4488

[PATCH 1/2] winevulkan: Allocate memory for VkDeviceCreateInfo with malloc.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/winevulkan/vulkan.c | 47 ++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index df109e5c84a..4409d1b0f43 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -390,20 +390,23 @@ static void wine_vk_device_get_queues(struct wine_device *device,
 }
 
 static VkResult wine_vk_device_convert_create_info(struct wine_phys_dev *phys_dev,
-        struct conversion_context *ctx, const VkDeviceCreateInfo *src, VkDeviceCreateInfo *dst)
+        const VkDeviceCreateInfo *src, VkDeviceCreateInfo *dst)
 {
+    const char **extensions;
     unsigned int i;
 
     *dst = *src;
+    dst->ppEnabledExtensionNames = NULL;
+    dst->enabledExtensionCount = 0;
 
     /* Should be filtered out by loader as ICDs don't support layers. */
     dst->enabledLayerCount = 0;
     dst->ppEnabledLayerNames = NULL;
 
-    TRACE("Enabled %u extensions.\n", dst->enabledExtensionCount);
-    for (i = 0; i < dst->enabledExtensionCount; i++)
+    TRACE("Enabled %u extensions.\n", src->enabledExtensionCount);
+    for (i = 0; i < src->enabledExtensionCount; i++)
     {
-        const char *extension_name = dst->ppEnabledExtensionNames[i];
+        const char *extension_name = src->ppEnabledExtensionNames[i];
         TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name));
         if (!wine_vk_device_extension_supported(extension_name))
         {
@@ -412,19 +415,21 @@ static VkResult wine_vk_device_convert_create_info(struct wine_phys_dev *phys_de
         }
     }
 
-    if (phys_dev->external_memory_align)
+    if (!src->enabledExtensionCount) extensions = NULL;
+    else
     {
-        const char **new_extensions;
+        if (!(extensions = malloc((src->enabledExtensionCount + 2) * sizeof(*extensions)))) return VK_ERROR_OUT_OF_HOST_MEMORY;
+        memcpy(extensions, src->ppEnabledExtensionNames, src->enabledExtensionCount * sizeof(*extensions));
+        dst->enabledExtensionCount = src->enabledExtensionCount;
+    }
 
-        new_extensions = conversion_context_alloc(ctx, (dst->enabledExtensionCount + 2) *
-                                                  sizeof(*dst->ppEnabledExtensionNames));
-        memcpy(new_extensions, src->ppEnabledExtensionNames,
-               dst->enabledExtensionCount * sizeof(*dst->ppEnabledExtensionNames));
-        new_extensions[dst->enabledExtensionCount++] = "VK_KHR_external_memory";
-        new_extensions[dst->enabledExtensionCount++] = "VK_EXT_external_memory_host";
-        dst->ppEnabledExtensionNames = new_extensions;
+    if (phys_dev->external_memory_align)
+    {
+        extensions[dst->enabledExtensionCount++] = "VK_KHR_external_memory";
+        extensions[dst->enabledExtensionCount++] = "VK_EXT_external_memory_host";
     }
 
+    dst->ppEnabledExtensionNames = extensions;
     return VK_SUCCESS;
 }
 
@@ -739,7 +744,6 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre
     VkDeviceCreateInfo create_info_host;
     struct VkQueue_T *queue_handles;
     struct wine_queue *next_queue;
-    struct conversion_context ctx;
     struct wine_device *object;
     unsigned int i;
     VkResult res;
@@ -758,17 +762,19 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre
         TRACE("Driver version: %#x.\n", properties.driverVersion);
     }
 
+    if ((res = wine_vk_device_convert_create_info(phys_dev, create_info, &create_info_host)) != VK_SUCCESS)
+        return res;
+
     if (!(object = calloc(1, sizeof(*object))))
+    {
+        free((void *)create_info_host.ppEnabledExtensionNames);
         return VK_ERROR_OUT_OF_HOST_MEMORY;
+    }
 
     object->phys_dev = phys_dev;
 
-    init_conversion_context(&ctx);
-    res = wine_vk_device_convert_create_info(phys_dev, &ctx, create_info, &create_info_host);
-    if (res == VK_SUCCESS)
-        res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev,
+    res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev,
                 &create_info_host, NULL /* allocator */, &object->device);
-    free_conversion_context(&ctx);
     WINE_VK_ADD_DISPATCHABLE_MAPPING(phys_dev->instance, device_handle, object->device, object);
     if (res != VK_SUCCESS)
     {
@@ -819,9 +825,12 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre
     device_handle->base.unix_handle = (uintptr_t)object;
     *ret_device = device_handle;
     TRACE("Created device %p (native device %p).\n", object, object->device);
+
+    free((void *)create_info_host.ppEnabledExtensionNames);
     return VK_SUCCESS;
 
 fail:
+    free((void *)create_info_host.ppEnabledExtensionNames);
     wine_vk_device_free(object);
     return res;
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/4488