[PATCH 10/10] winex11: Implement vkDestroyInstance.

Roderick Colenbrander <[email protected]>
Newsgroups gmane.comp.emulators.wine.patches
Message-ID <[email protected]>
Signed-off-by: Roderick Colenbrander <[email protected]>
---
 dlls/winex11.drv/vulkan.c         | 12 ++++++++++++
 dlls/winex11.drv/vulkan_private.h |  1 +
 dlls/winex11.drv/vulkan_thunks.c  |  6 ------
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index 70adbe5a92..79e66866bc 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -208,6 +208,18 @@ err:
     return res;
 }
 
+void WINAPI X11DRV_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator)
+{
+    TRACE("%p %p\n", instance, pAllocator);
+
+    if (pAllocator)
+    {
+        FIXME("Support for allocation callbacks not implemented yet\n");
+    }
+
+    wine_vk_instance_free(instance);
+}
+
 VkResult WINAPI X11DRV_vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount,
         VkExtensionProperties* pProperties)
 {
diff --git a/dlls/winex11.drv/vulkan_private.h b/dlls/winex11.drv/vulkan_private.h
index 15c0b16fc8..a50f0ebeff 100644
--- a/dlls/winex11.drv/vulkan_private.h
+++ b/dlls/winex11.drv/vulkan_private.h
@@ -67,6 +67,7 @@ extern const struct vulkan_func vk_instance_dispatch_table[] DECLSPEC_HIDDEN;
 extern const int vk_instance_dispatch_table_size DECLSPEC_HIDDEN;
 
 VkResult WINAPI X11DRV_vkCreateInstance(const VkInstanceCreateInfo*, const VkAllocationCallbacks*, VkInstance*) DECLSPEC_HIDDEN;
+void WINAPI X11DRV_vkDestroyInstance(VkInstance, const VkAllocationCallbacks*) DECLSPEC_HIDDEN;
 VkResult WINAPI X11DRV_vkEnumerateInstanceExtensionProperties(const char*, uint32_t*, VkExtensionProperties*) DECLSPEC_HIDDEN;
 PFN_vkVoidFunction WINAPI X11DRV_vkGetInstanceProcAddr(VkInstance, const char*) DECLSPEC_HIDDEN;
 
diff --git a/dlls/winex11.drv/vulkan_thunks.c b/dlls/winex11.drv/vulkan_thunks.c
index 653f10955d..3c63c8e876 100644
--- a/dlls/winex11.drv/vulkan_thunks.c
+++ b/dlls/winex11.drv/vulkan_thunks.c
@@ -17,12 +17,6 @@ static VkResult WINAPI X11DRV_vkCreateDevice(VkPhysicalDevice physicalDevice, co
     return VK_ERROR_OUT_OF_HOST_MEMORY;
 }
 
-static void WINAPI X11DRV_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks * pAllocator)
-{
-    FIXME("stub: %p, %p\n", instance, pAllocator);
-    return;
-}
-
 static VkResult WINAPI X11DRV_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char * pLayerName, uint32_t * pPropertyCount, VkExtensionProperties * pProperties)
 {
     FIXME("stub: %p, %p, %p, %p\n", physicalDevice, pLayerName, pPropertyCount, pProperties);
-- 
2.13.6
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.