[PATCH v3 0/6] MR5491: win32u: Move most vulkan surface code out of the drivers.
-- v3: win32u: Move host surface destruction out of the drivers. win32u: Pass HWND directly to vulkan surface creation driver callback. win32u: Rename vulkan surface creation/destroy driver callbacks. winevulkan: Pass win32u surface wrappers for each vkQueuePresent swapchain. win32u: Introduce a new VkSurfaceKHR wrapping structure. win32u: Introduce a distinct vulkan interface between win32u and the user drivers. https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/driver.c | 6 +-- dlls/win32u/vulkan.c | 73 +++++++++++++++++++++++++++---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/vulkan.c | 33 +++++++------- dlls/winewayland.drv/vulkan.c | 51 ++++++++++----------- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winex11.drv/vulkan.c | 33 +++++++------- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 4 +- include/wine/vulkan_driver.h | 12 ++++- 10 files changed, 140 insertions(+), 78 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index e55e9ee1b23..e22a457d6d6 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -897,7 +897,7 @@ static BOOL nulldrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr return FALSE; } -static UINT nulldrv_VulkanInit( UINT version, void *vulkan_handle, struct vulkan_funcs *vulkan_funcs ) +static UINT nulldrv_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs ) { return STATUS_NOT_IMPLEMENTED; } @@ -1213,9 +1213,9 @@ static BOOL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWI return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect ); } -static UINT loaderdrv_VulkanInit( UINT version, void *vulkan_handle, struct vulkan_funcs *vulkan_funcs ) +static UINT loaderdrv_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs ) { - return load_driver()->pVulkanInit( version, vulkan_handle, vulkan_funcs ); + return load_driver()->pVulkanInit( version, vulkan_handle, driver_funcs ); } static const struct user_driver_funcs lazy_load_driver = diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index b29a0edee0f..9c02e72b0d7 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN static void *vulkan_handle; +static const struct vulkan_driver_funcs *driver_funcs; static struct vulkan_funcs vulkan_funcs; static VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); @@ -60,7 +61,7 @@ static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR for (i = 0; i < present_info->swapchainCount; i++) { VkResult swapchain_res = present_info->pResults ? present_info->pResults[i] : res; - vulkan_funcs.p_vulkan_surface_presented( surfaces[i], swapchain_res ); + driver_funcs->p_vulkan_surface_presented( surfaces[i], swapchain_res ); } return res; @@ -70,7 +71,7 @@ static void *win32u_vkGetDeviceProcAddr( VkDevice device, const char *name ) { TRACE( "device %p, name %s\n", device, debugstr_a(name) ); - if (!strcmp( name, "vkGetDeviceProcAddr" )) return win32u_vkGetDeviceProcAddr; + if (!strcmp( name, "vkGetDeviceProcAddr" )) return vulkan_funcs.p_vkGetDeviceProcAddr; if (!strcmp( name, "vkQueuePresentKHR" )) return vulkan_funcs.p_vkQueuePresentKHR; return p_vkGetDeviceProcAddr( device, name ); @@ -84,16 +85,63 @@ static void *win32u_vkGetInstanceProcAddr( VkInstance instance, const char *name if (!strcmp( name, "vkCreateWin32SurfaceKHR" )) return vulkan_funcs.p_vkCreateWin32SurfaceKHR; if (!strcmp( name, "vkDestroySurfaceKHR" )) return vulkan_funcs.p_vkDestroySurfaceKHR; - if (!strcmp( name, "vkGetInstanceProcAddr" )) return win32u_vkGetInstanceProcAddr; + if (!strcmp( name, "vkGetInstanceProcAddr" )) return vulkan_funcs.p_vkGetInstanceProcAddr; if (!strcmp( name, "vkGetPhysicalDeviceWin32PresentationSupportKHR" )) return vulkan_funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR; /* vkGetInstanceProcAddr also loads any children of instance, so device functions as well. */ - if (!strcmp( name, "vkGetDeviceProcAddr" )) return win32u_vkGetDeviceProcAddr; + if (!strcmp( name, "vkGetDeviceProcAddr" )) return vulkan_funcs.p_vkGetDeviceProcAddr; if (!strcmp( name, "vkQueuePresentKHR" )) return vulkan_funcs.p_vkQueuePresentKHR; return p_vkGetInstanceProcAddr( instance, name ); } +static struct vulkan_funcs vulkan_funcs = +{ + .p_vkQueuePresentKHR = win32u_vkQueuePresentKHR, + .p_vkGetDeviceProcAddr = win32u_vkGetDeviceProcAddr, + .p_vkGetInstanceProcAddr = win32u_vkGetInstanceProcAddr, +}; + +static VkResult nulldrv_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, + const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface ) +{ + FIXME( "stub!\n" ); + return VK_ERROR_INCOMPATIBLE_DRIVER; +} + +static void nulldrv_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *allocator ) +{ +} + +static void nulldrv_vulkan_surface_presented( HWND hwnd, VkResult result ) +{ +} + +static VkBool32 nulldrv_vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice device, uint32_t queue ) +{ + return VK_TRUE; +} + +static const char *nulldrv_get_host_surface_extension(void) +{ + return "VK_WINE_nulldrv_surface"; +} + +static VkSurfaceKHR nulldrv_wine_get_host_surface( VkSurfaceKHR surface ) +{ + return surface; +} + +static const struct vulkan_driver_funcs nulldrv_funcs = +{ + .p_vkCreateWin32SurfaceKHR = nulldrv_vkCreateWin32SurfaceKHR, + .p_vkDestroySurfaceKHR = nulldrv_vkDestroySurfaceKHR, + .p_vulkan_surface_presented = nulldrv_vulkan_surface_presented, + .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = nulldrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_host_surface_extension = nulldrv_get_host_surface_extension, + .p_wine_get_host_surface = nulldrv_wine_get_host_surface, +}; + static void vulkan_init(void) { UINT status; @@ -104,7 +152,7 @@ static void vulkan_init(void) return; } - if ((status = user_driver->pVulkanInit( WINE_VULKAN_DRIVER_VERSION, vulkan_handle, &vulkan_funcs )) && + if ((status = user_driver->pVulkanInit( WINE_VULKAN_DRIVER_VERSION, vulkan_handle, &driver_funcs )) && status != STATUS_NOT_IMPLEMENTED) { ERR( "Failed to initialize the driver vulkan functions, status %#x\n", status ); @@ -113,6 +161,17 @@ static void vulkan_init(void) return; } + if (status == STATUS_NOT_IMPLEMENTED) + driver_funcs = &nulldrv_funcs; + else + { + vulkan_funcs.p_vkCreateWin32SurfaceKHR = driver_funcs->p_vkCreateWin32SurfaceKHR; + vulkan_funcs.p_vkDestroySurfaceKHR = driver_funcs->p_vkDestroySurfaceKHR; + vulkan_funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR = driver_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; + vulkan_funcs.p_get_host_surface_extension = driver_funcs->p_get_host_surface_extension; + vulkan_funcs.p_wine_get_host_surface = driver_funcs->p_wine_get_host_surface; + } + #define LOAD_FUNCPTR( f ) \ if (!(p_##f = dlsym( vulkan_handle, #f ))) \ { \ @@ -126,10 +185,6 @@ static void vulkan_init(void) LOAD_FUNCPTR( vkGetInstanceProcAddr ); LOAD_FUNCPTR( vkQueuePresentKHR ); #undef LOAD_FUNCPTR - - vulkan_funcs.p_vkGetDeviceProcAddr = win32u_vkGetDeviceProcAddr; - vulkan_funcs.p_vkGetInstanceProcAddr = win32u_vkGetInstanceProcAddr; - vulkan_funcs.p_vkQueuePresentKHR = win32u_vkQueuePresentKHR; } /*********************************************************************** diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f5793006c35..b8d54222a47 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -257,7 +257,7 @@ extern BOOL macdrv_SystemParametersInfo(UINT action, UINT int_param, void *ptr_p extern void macdrv_lost_pasteboard_ownership(HWND hwnd); extern struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version); -extern UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs *vulkan_funcs); +extern UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs); extern void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, const RECT* old_client_rect); extern CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmColor, diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index ceae7714a60..287843f2f15 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -80,7 +80,7 @@ static VkResult (*pvkCreateMetalSurfaceEXT)(VkInstance, const VkMetalSurfaceCrea static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *); -static const struct vulkan_funcs vulkan_funcs; +static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs; static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { @@ -196,6 +196,10 @@ static void macdrv_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface wine_vk_surface_destroy(instance, mac_surface); } +static void macdrv_vulkan_surface_presented(HWND hwnd, VkResult result) +{ +} + static VkBool32 macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, uint32_t index) { @@ -218,25 +222,18 @@ static VkSurfaceKHR macdrv_wine_get_host_surface(VkSurfaceKHR surface) return mac_surface->host_surface; } -static void macdrv_vulkan_surface_presented(HWND hwnd, VkResult result) +static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs = { -} + .p_vkCreateWin32SurfaceKHR = macdrv_vkCreateWin32SurfaceKHR, + .p_vkDestroySurfaceKHR = macdrv_vkDestroySurfaceKHR, + .p_vulkan_surface_presented = macdrv_vulkan_surface_presented, -static const struct vulkan_funcs vulkan_funcs = -{ - macdrv_vkCreateWin32SurfaceKHR, - macdrv_vkDestroySurfaceKHR, - NULL, - NULL, - macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, - NULL, - - macdrv_get_host_surface_extension, - macdrv_wine_get_host_surface, - macdrv_vulkan_surface_presented, + .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_host_surface_extension = macdrv_get_host_surface_extension, + .p_wine_get_host_surface = macdrv_wine_get_host_surface, }; -UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs *driver_funcs) +UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs) { if (version != WINE_VULKAN_DRIVER_VERSION) { @@ -250,13 +247,13 @@ UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs *d LOAD_FUNCPTR(vkDestroySurfaceKHR) #undef LOAD_FUNCPTR - *driver_funcs = vulkan_funcs; + *driver_funcs = &macdrv_vulkan_driver_funcs; return STATUS_SUCCESS; } #else /* No vulkan */ -UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs *driver_funcs) +UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs) { ERR("Wine was built without Vulkan support.\n"); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 6e95fb4b0f6..7de84637a48 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -57,7 +57,7 @@ static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurface static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice, uint32_t, struct wl_display *); -static const struct vulkan_funcs vulkan_funcs; +static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs; struct wine_vk_surface { @@ -176,25 +176,6 @@ static void wayland_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surfac wine_vk_surface_destroy(wine_vk_surface); } -static VkBool32 wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, - uint32_t index) -{ - TRACE("%p %u\n", phys_dev, index); - - return pvkGetPhysicalDeviceWaylandPresentationSupportKHR(phys_dev, index, - process_wayland.wl_display); -} - -static const char *wayland_get_host_surface_extension(void) -{ - return "VK_KHR_wayland_surface"; -} - -static VkSurfaceKHR wayland_wine_get_host_surface(VkSurfaceKHR surface) -{ - return wine_vk_surface_from_handle(surface)->host_surface; -} - static void wayland_vulkan_surface_presented(HWND hwnd, VkResult result) { struct wayland_surface *wayland_surface; @@ -216,20 +197,40 @@ static void wayland_vulkan_surface_presented(HWND hwnd, VkResult result) } } -static const struct vulkan_funcs vulkan_funcs = +static VkBool32 wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, + uint32_t index) +{ + TRACE("%p %u\n", phys_dev, index); + + return pvkGetPhysicalDeviceWaylandPresentationSupportKHR(phys_dev, index, + process_wayland.wl_display); +} + +static const char *wayland_get_host_surface_extension(void) +{ + return "VK_KHR_wayland_surface"; +} + +static VkSurfaceKHR wayland_wine_get_host_surface(VkSurfaceKHR surface) +{ + return wine_vk_surface_from_handle(surface)->host_surface; +} + +static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs = { .p_vkCreateWin32SurfaceKHR = wayland_vkCreateWin32SurfaceKHR, .p_vkDestroySurfaceKHR = wayland_vkDestroySurfaceKHR, + .p_vulkan_surface_presented = wayland_vulkan_surface_presented, + .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, .p_get_host_surface_extension = wayland_get_host_surface_extension, .p_wine_get_host_surface = wayland_wine_get_host_surface, - .p_vulkan_surface_presented = wayland_vulkan_surface_presented, }; /********************************************************************** * WAYLAND_VulkanInit */ -UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs *driver_funcs) +UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs) { if (version != WINE_VULKAN_DRIVER_VERSION) { @@ -243,13 +244,13 @@ UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs * LOAD_FUNCPTR(vkGetPhysicalDeviceWaylandPresentationSupportKHR); #undef LOAD_FUNCPTR - *driver_funcs = vulkan_funcs; + *driver_funcs = &wayland_vulkan_driver_funcs; return STATUS_SUCCESS; } #else /* No vulkan */ -UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs *driver_funcs) +UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs) { ERR( "Wine was built without Vulkan support.\n" ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index d6359e57db3..a4c62847fb4 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -338,7 +338,7 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, struct window_surface **surface); -UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, struct vulkan_funcs *driver_funcs); +UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs); struct opengl_funcs *WAYLAND_wine_get_wgl_driver(UINT version); #endif /* __WINE_WAYLANDDRV_H */ diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 0a0a1365b3c..a1edf488256 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -77,7 +77,7 @@ static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreate static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice, uint32_t, Display *, VisualID); -static const struct vulkan_funcs vulkan_funcs; +static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs; static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { @@ -209,6 +209,10 @@ static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface wine_vk_surface_release(x11_surface); } +static void X11DRV_vulkan_surface_presented(HWND hwnd, VkResult result) +{ +} + static VkBool32 X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, uint32_t index) { @@ -232,25 +236,18 @@ static VkSurfaceKHR X11DRV_wine_get_host_surface( VkSurfaceKHR surface ) return x11_surface->host_surface; } -static void X11DRV_vulkan_surface_presented(HWND hwnd, VkResult result) +static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs = { -} + .p_vkCreateWin32SurfaceKHR = X11DRV_vkCreateWin32SurfaceKHR, + .p_vkDestroySurfaceKHR = X11DRV_vkDestroySurfaceKHR, + .p_vulkan_surface_presented = X11DRV_vulkan_surface_presented, -static const struct vulkan_funcs vulkan_funcs = -{ - X11DRV_vkCreateWin32SurfaceKHR, - X11DRV_vkDestroySurfaceKHR, - NULL, - NULL, - X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, - NULL, - - X11DRV_get_host_surface_extension, - X11DRV_wine_get_host_surface, - X11DRV_vulkan_surface_presented, + .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_host_surface_extension = X11DRV_get_host_surface_extension, + .p_wine_get_host_surface = X11DRV_wine_get_host_surface, }; -UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, struct vulkan_funcs *driver_funcs ) +UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs ) { if (version != WINE_VULKAN_DRIVER_VERSION) { @@ -266,13 +263,13 @@ UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, struct vulkan_funcs * LOAD_FUNCPTR( vkGetPhysicalDeviceXlibPresentationSupportKHR ); #undef LOAD_FUNCPTR - *driver_funcs = vulkan_funcs; + *driver_funcs = &x11drv_vulkan_driver_funcs; return STATUS_SUCCESS; } #else /* No vulkan */ -UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, struct vulkan_funcs *driver_funcs ) +UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs ) { ERR( "Wine was built without Vulkan support.\n" ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index af2fe18fb26..c308f54adb3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -289,7 +289,7 @@ extern BOOL shape_layered_windows; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void); extern struct opengl_funcs *get_glx_driver(UINT); -extern UINT X11DRV_VulkanInit( UINT, void *, struct vulkan_funcs * ); +extern UINT X11DRV_VulkanInit( UINT, void *, const struct vulkan_driver_funcs ** ); extern struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, Atom *targets, UINT count, diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 7827cd3a605..539ff82d16d 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -269,6 +269,8 @@ struct gdi_device_manager struct tagUPDATELAYEREDWINDOWINFO; +struct vulkan_driver_funcs; + struct user_driver_funcs { struct gdi_dc_funcs dc_funcs; @@ -339,7 +341,7 @@ struct user_driver_funcs /* system parameters */ BOOL (*pSystemParametersInfo)(UINT,UINT,void*,UINT); /* vulkan support */ - UINT (*pVulkanInit)(UINT,void *,struct vulkan_funcs *); + UINT (*pVulkanInit)(UINT,void *,const struct vulkan_driver_funcs **); /* opengl support */ struct opengl_funcs * (*pwine_get_wgl_driver)(UINT); /* thread management */ diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 638b62c498c..8b24cd4978d 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 27 +#define WINE_VULKAN_DRIVER_VERSION 28 struct vulkan_funcs { @@ -39,8 +39,18 @@ struct vulkan_funcs /* winevulkan specific functions */ const char *(*p_get_host_surface_extension)(void); VkSurfaceKHR (*p_wine_get_host_surface)(VkSurfaceKHR); +}; +/* interface between win32u and the user drivers */ +struct vulkan_driver_funcs +{ + VkResult (*p_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); + void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); void (*p_vulkan_surface_presented)(HWND, VkResult); + + VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); + const char *(*p_get_host_surface_extension)(void); + VkSurfaceKHR (*p_wine_get_host_surface)(VkSurfaceKHR); }; #endif /* __WINE_VULKAN_DRIVER_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/vulkan.c | 60 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 9c02e72b0d7..8d63e8bbd14 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -48,6 +48,54 @@ static VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); static void *(*p_vkGetDeviceProcAddr)(VkDevice, const char *); static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); +struct surface +{ + VkSurfaceKHR host_surface; + VkSurfaceKHR driver_surface; +}; + +static inline struct surface *surface_from_handle( VkSurfaceKHR handle ) +{ + return (struct surface *)(uintptr_t)handle; +} + +static inline VkSurfaceKHR surface_to_handle( struct surface *surface ) +{ + return (VkSurfaceKHR)(uintptr_t)surface; +} + +static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, + const VkAllocationCallbacks *allocator, VkSurfaceKHR *handle ) +{ + struct surface *surface; + VkResult res; + + TRACE( "instance %p, info %p, allocator %p, handle %p\n", instance, info, allocator, handle ); + if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); + + if (!(surface = calloc( 1, sizeof(*surface) ))) return VK_ERROR_OUT_OF_HOST_MEMORY; + if ((res = driver_funcs->p_vkCreateWin32SurfaceKHR( instance, info, NULL /* allocator */, &surface->driver_surface ))) + { + free( surface ); + return res; + } + + surface->host_surface = driver_funcs->p_wine_get_host_surface( surface->driver_surface ); + *handle = surface_to_handle( surface ); + return VK_SUCCESS; +} + +static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle, const VkAllocationCallbacks *allocator ) +{ + struct surface *surface = surface_from_handle( handle ); + + TRACE( "instance %p, handle 0x%s, allocator %p\n", instance, wine_dbgstr_longlong(handle), allocator ); + if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); + + driver_funcs->p_vkDestroySurfaceKHR( instance, surface->driver_surface, NULL /* allocator */ ); + free( surface ); +} + static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR *present_info, HWND *surfaces ) { VkPresentInfoKHR host_present_info = *present_info; @@ -95,11 +143,20 @@ static void *win32u_vkGetInstanceProcAddr( VkInstance instance, const char *name return p_vkGetInstanceProcAddr( instance, name ); } +static VkSurfaceKHR win32u_wine_get_host_surface( VkSurfaceKHR handle ) +{ + struct surface *surface = surface_from_handle( handle ); + return surface->host_surface; +} + static struct vulkan_funcs vulkan_funcs = { + .p_vkCreateWin32SurfaceKHR = win32u_vkCreateWin32SurfaceKHR, + .p_vkDestroySurfaceKHR = win32u_vkDestroySurfaceKHR, .p_vkQueuePresentKHR = win32u_vkQueuePresentKHR, .p_vkGetDeviceProcAddr = win32u_vkGetDeviceProcAddr, .p_vkGetInstanceProcAddr = win32u_vkGetInstanceProcAddr, + .p_wine_get_host_surface = win32u_wine_get_host_surface, }; static VkResult nulldrv_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, @@ -165,11 +222,8 @@ static void vulkan_init(void) driver_funcs = &nulldrv_funcs; else { - vulkan_funcs.p_vkCreateWin32SurfaceKHR = driver_funcs->p_vkCreateWin32SurfaceKHR; - vulkan_funcs.p_vkDestroySurfaceKHR = driver_funcs->p_vkDestroySurfaceKHR; vulkan_funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR = driver_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; vulkan_funcs.p_get_host_surface_extension = driver_funcs->p_get_host_surface_extension; - vulkan_funcs.p_wine_get_host_surface = driver_funcs->p_wine_get_host_surface; } #define LOAD_FUNCPTR( f ) \ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/vulkan.c | 11 +++++++---- dlls/winevulkan/vulkan.c | 4 ++-- include/wine/vulkan_driver.h | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 8d63e8bbd14..ecc6a532c83 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -52,6 +52,7 @@ struct surface { VkSurfaceKHR host_surface; VkSurfaceKHR driver_surface; + HWND hwnd; }; static inline struct surface *surface_from_handle( VkSurfaceKHR handle ) @@ -80,6 +81,7 @@ static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin return res; } + surface->hwnd = info->hwnd; surface->host_surface = driver_funcs->p_wine_get_host_surface( surface->driver_surface ); *handle = surface_to_handle( surface ); return VK_SUCCESS; @@ -96,20 +98,21 @@ static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle free( surface ); } -static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR *present_info, HWND *surfaces ) +static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR *present_info, VkSurfaceKHR *surfaces ) { - VkPresentInfoKHR host_present_info = *present_info; VkResult res; UINT i; TRACE( "queue %p, present_info %p\n", queue, present_info ); - res = p_vkQueuePresentKHR( queue, &host_present_info ); + res = p_vkQueuePresentKHR( queue, present_info ); for (i = 0; i < present_info->swapchainCount; i++) { VkResult swapchain_res = present_info->pResults ? present_info->pResults[i] : res; - driver_funcs->p_vulkan_surface_presented( surfaces[i], swapchain_res ); + struct surface *surface = surface_from_handle( surfaces[i] ); + + driver_funcs->p_vulkan_surface_presented( surface->hwnd, swapchain_res ); } return res; diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4221b7066e6..d619c470e58 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1740,7 +1740,7 @@ void wine_vkDestroySwapchainKHR(VkDevice device_handle, VkSwapchainKHR swapchain VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *present_info) { VkSwapchainKHR swapchains_buffer[16], *swapchains = swapchains_buffer; - HWND surfaces_buffer[ARRAY_SIZE(swapchains_buffer)], *surfaces = surfaces_buffer; + VkSurfaceKHR surfaces_buffer[ARRAY_SIZE(swapchains_buffer)], *surfaces = surfaces_buffer; struct wine_queue *queue = wine_queue_from_handle(queue_handle); VkPresentInfoKHR present_info_host = *present_info; VkResult res; @@ -1759,7 +1759,7 @@ VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *pr struct wine_swapchain *swapchain = wine_swapchain_from_handle(present_info->pSwapchains[i]); struct wine_surface *surface = swapchain->surface; swapchains[i] = swapchain->host_swapchain; - surfaces[i] = surface->hwnd; + surfaces[i] = surface->driver_surface; } present_info_host.pSwapchains = swapchains; diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 8b24cd4978d..96f60cb067a 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 28 +#define WINE_VULKAN_DRIVER_VERSION 29 struct vulkan_funcs { @@ -34,7 +34,7 @@ struct vulkan_funcs void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *); void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *); VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); - VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *, HWND *surfaces); + VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *, VkSurfaceKHR *surfaces); /* winevulkan specific functions */ const char *(*p_get_host_surface_extension)(void); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/vulkan.c | 13 ++++++------- dlls/winemac.drv/vulkan.c | 22 +++++++--------------- dlls/winewayland.drv/vulkan.c | 24 ++++++++---------------- dlls/winex11.drv/vulkan.c | 21 ++++++--------------- include/wine/vulkan_driver.h | 6 +++--- 5 files changed, 30 insertions(+), 56 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index ecc6a532c83..5b6affa2f30 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -75,7 +75,7 @@ static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); if (!(surface = calloc( 1, sizeof(*surface) ))) return VK_ERROR_OUT_OF_HOST_MEMORY; - if ((res = driver_funcs->p_vkCreateWin32SurfaceKHR( instance, info, NULL /* allocator */, &surface->driver_surface ))) + if ((res = driver_funcs->p_vulkan_surface_create( instance, info, &surface->driver_surface ))) { free( surface ); return res; @@ -94,7 +94,7 @@ static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle TRACE( "instance %p, handle 0x%s, allocator %p\n", instance, wine_dbgstr_longlong(handle), allocator ); if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); - driver_funcs->p_vkDestroySurfaceKHR( instance, surface->driver_surface, NULL /* allocator */ ); + driver_funcs->p_vulkan_surface_destroy( instance, surface->driver_surface ); free( surface ); } @@ -162,14 +162,13 @@ static struct vulkan_funcs vulkan_funcs = .p_wine_get_host_surface = win32u_wine_get_host_surface, }; -static VkResult nulldrv_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, - const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface ) +static VkResult nulldrv_vulkan_surface_create( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, VkSurfaceKHR *surface ) { FIXME( "stub!\n" ); return VK_ERROR_INCOMPATIBLE_DRIVER; } -static void nulldrv_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *allocator ) +static void nulldrv_vulkan_surface_destroy( VkInstance instance, VkSurfaceKHR surface ) { } @@ -194,8 +193,8 @@ static VkSurfaceKHR nulldrv_wine_get_host_surface( VkSurfaceKHR surface ) static const struct vulkan_driver_funcs nulldrv_funcs = { - .p_vkCreateWin32SurfaceKHR = nulldrv_vkCreateWin32SurfaceKHR, - .p_vkDestroySurfaceKHR = nulldrv_vkDestroySurfaceKHR, + .p_vulkan_surface_create = nulldrv_vulkan_surface_create, + .p_vulkan_surface_destroy = nulldrv_vulkan_surface_destroy, .p_vulkan_surface_presented = nulldrv_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = nulldrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, .p_get_host_surface_extension = nulldrv_get_host_surface_extension, diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 287843f2f15..0dde23b0cba 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -100,18 +100,14 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface free(surface); } -static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, - const VkWin32SurfaceCreateInfoKHR *create_info, - const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) +static VkResult macdrv_vulkan_surface_create(VkInstance instance, + const VkWin32SurfaceCreateInfoKHR *create_info, VkSurfaceKHR *surface) { VkResult res; struct wine_vk_surface *mac_surface; struct macdrv_win_data *data; - TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); - - if (allocator) - FIXME("Support for allocation callbacks not implemented yet\n"); + TRACE("%p %p %p\n", instance, create_info, surface); if (!(data = get_win_data(create_info->hwnd))) { @@ -183,15 +179,11 @@ err: return res; } -static void macdrv_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, - const VkAllocationCallbacks *allocator) +static void macdrv_vulkan_surface_destroy(VkInstance instance, VkSurfaceKHR surface) { struct wine_vk_surface *mac_surface = surface_from_handle(surface); - TRACE("%p 0x%s %p\n", instance, wine_dbgstr_longlong(surface), allocator); - - if (allocator) - FIXME("Support for allocation callbacks not implemented yet\n"); + TRACE("%p 0x%s\n", instance, wine_dbgstr_longlong(surface)); wine_vk_surface_destroy(instance, mac_surface); } @@ -224,8 +216,8 @@ static VkSurfaceKHR macdrv_wine_get_host_surface(VkSurfaceKHR surface) static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs = { - .p_vkCreateWin32SurfaceKHR = macdrv_vkCreateWin32SurfaceKHR, - .p_vkDestroySurfaceKHR = macdrv_vkDestroySurfaceKHR, + .p_vulkan_surface_create = macdrv_vulkan_surface_create, + .p_vulkan_surface_destroy = macdrv_vulkan_surface_destroy, .p_vulkan_surface_presented = macdrv_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 7de84637a48..e24c344606e 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -94,20 +94,16 @@ static void wine_vk_surface_destroy(struct wine_vk_surface *wine_vk_surface) free(wine_vk_surface); } -static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, - const VkWin32SurfaceCreateInfoKHR *create_info, - const VkAllocationCallbacks *allocator, - VkSurfaceKHR *vk_surface) +static VkResult wayland_vulkan_surface_create(VkInstance instance, + const VkWin32SurfaceCreateInfoKHR *create_info, + VkSurfaceKHR *vk_surface) { VkResult res; VkWaylandSurfaceCreateInfoKHR create_info_host; struct wine_vk_surface *wine_vk_surface; struct wayland_surface *wayland_surface; - TRACE("%p %p %p %p\n", instance, create_info, allocator, vk_surface); - - if (allocator) - FIXME("Support for allocation callbacks not implemented yet\n"); + TRACE("%p %p %p\n", instance, create_info, vk_surface); wine_vk_surface = calloc(1, sizeof(*wine_vk_surface)); if (!wine_vk_surface) @@ -162,15 +158,11 @@ err: return res; } -static void wayland_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, - const VkAllocationCallbacks *allocator) +static void wayland_vulkan_surface_destroy(VkInstance instance, VkSurfaceKHR surface) { struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface); - TRACE("%p 0x%s %p\n", instance, wine_dbgstr_longlong(surface), allocator); - - if (allocator) - FIXME("Support for allocation callbacks not implemented yet\n"); + TRACE("%p 0x%s\n", instance, wine_dbgstr_longlong(surface)); pvkDestroySurfaceKHR(instance, wine_vk_surface->host_surface, NULL /* allocator */); wine_vk_surface_destroy(wine_vk_surface); @@ -218,8 +210,8 @@ static VkSurfaceKHR wayland_wine_get_host_surface(VkSurfaceKHR surface) static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs = { - .p_vkCreateWin32SurfaceKHR = wayland_vkCreateWin32SurfaceKHR, - .p_vkDestroySurfaceKHR = wayland_vkDestroySurfaceKHR, + .p_vulkan_surface_create = wayland_vulkan_surface_create, + .p_vulkan_surface_destroy = wayland_vulkan_surface_destroy, .p_vulkan_surface_presented = wayland_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index a1edf488256..534f88f515c 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -132,18 +132,13 @@ void vulkan_thread_detach(void) pthread_mutex_unlock(&vulkan_mutex); } -static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, - const VkWin32SurfaceCreateInfoKHR *create_info, - const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) +static VkResult X11DRV_vulkan_surface_create( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *create_info, VkSurfaceKHR *surface ) { VkResult res; VkXlibSurfaceCreateInfoKHR create_info_host; struct wine_vk_surface *x11_surface; - TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); - - if (allocator) - FIXME("Support for allocation callbacks not implemented yet\n"); + TRACE( "%p %p %p\n", instance, create_info, surface ); /* TODO: support child window rendering. */ if (NtUserGetAncestor( create_info->hwnd, GA_PARENT ) != NtUserGetDesktopWindow()) @@ -195,15 +190,11 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, return VK_SUCCESS; } -static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, - const VkAllocationCallbacks *allocator) +static void X11DRV_vulkan_surface_destroy( VkInstance instance, VkSurfaceKHR surface ) { struct wine_vk_surface *x11_surface = surface_from_handle(surface); - TRACE("%p 0x%s %p\n", instance, wine_dbgstr_longlong(surface), allocator); - - if (allocator) - FIXME("Support for allocation callbacks not implemented yet\n"); + TRACE( "%p 0x%s\n", instance, wine_dbgstr_longlong(surface) ); pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); wine_vk_surface_release(x11_surface); @@ -238,8 +229,8 @@ static VkSurfaceKHR X11DRV_wine_get_host_surface( VkSurfaceKHR surface ) static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs = { - .p_vkCreateWin32SurfaceKHR = X11DRV_vkCreateWin32SurfaceKHR, - .p_vkDestroySurfaceKHR = X11DRV_vkDestroySurfaceKHR, + .p_vulkan_surface_create = X11DRV_vulkan_surface_create, + .p_vulkan_surface_destroy = X11DRV_vulkan_surface_destroy, .p_vulkan_surface_presented = X11DRV_vulkan_surface_presented, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 96f60cb067a..241650e2496 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 29 +#define WINE_VULKAN_DRIVER_VERSION 30 struct vulkan_funcs { @@ -44,8 +44,8 @@ struct vulkan_funcs /* interface between win32u and the user drivers */ struct vulkan_driver_funcs { - VkResult (*p_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); - void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); + VkResult (*p_vulkan_surface_create)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, VkSurfaceKHR *); + void (*p_vulkan_surface_destroy)(VkInstance, VkSurfaceKHR); void (*p_vulkan_surface_presented)(HWND, VkResult); VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
From: Rémi Bernon <rbernon(a)codeweavers.com> And to destroy, it'll be useful later. --- dlls/win32u/vulkan.c | 8 ++++---- dlls/winemac.drv/vulkan.c | 17 ++++++++--------- dlls/winewayland.drv/vulkan.c | 16 +++++++--------- dlls/winex11.drv/vulkan.c | 16 ++++++++-------- include/wine/vulkan_driver.h | 6 +++--- 5 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 5b6affa2f30..d2323265db9 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -75,7 +75,7 @@ static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance instance, const VkWin if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); if (!(surface = calloc( 1, sizeof(*surface) ))) return VK_ERROR_OUT_OF_HOST_MEMORY; - if ((res = driver_funcs->p_vulkan_surface_create( instance, info, &surface->driver_surface ))) + if ((res = driver_funcs->p_vulkan_surface_create( info->hwnd, instance, &surface->driver_surface ))) { free( surface ); return res; @@ -94,7 +94,7 @@ static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle TRACE( "instance %p, handle 0x%s, allocator %p\n", instance, wine_dbgstr_longlong(handle), allocator ); if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); - driver_funcs->p_vulkan_surface_destroy( instance, surface->driver_surface ); + driver_funcs->p_vulkan_surface_destroy( surface->hwnd, instance, surface->driver_surface ); free( surface ); } @@ -162,13 +162,13 @@ static struct vulkan_funcs vulkan_funcs = .p_wine_get_host_surface = win32u_wine_get_host_surface, }; -static VkResult nulldrv_vulkan_surface_create( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *info, VkSurfaceKHR *surface ) +static VkResult nulldrv_vulkan_surface_create( HWND hwnd, VkInstance instance, VkSurfaceKHR *surface ) { FIXME( "stub!\n" ); return VK_ERROR_INCOMPATIBLE_DRIVER; } -static void nulldrv_vulkan_surface_destroy( VkInstance instance, VkSurfaceKHR surface ) +static void nulldrv_vulkan_surface_destroy( HWND hwnd, VkInstance instance, VkSurfaceKHR surface ) { } diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 0dde23b0cba..465389fff46 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -100,18 +100,17 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface free(surface); } -static VkResult macdrv_vulkan_surface_create(VkInstance instance, - const VkWin32SurfaceCreateInfoKHR *create_info, VkSurfaceKHR *surface) +static VkResult macdrv_vulkan_surface_create(HWND hwnd, VkInstance instance, VkSurfaceKHR *surface) { VkResult res; struct wine_vk_surface *mac_surface; struct macdrv_win_data *data; - TRACE("%p %p %p\n", instance, create_info, surface); + TRACE("%p %p %p\n", hwnd, instance, surface); - if (!(data = get_win_data(create_info->hwnd))) + if (!(data = get_win_data(hwnd))) { - FIXME("DC for window %p of other process: not implemented\n", create_info->hwnd); + FIXME("DC for window %p of other process: not implemented\n", hwnd); return VK_ERROR_INCOMPATIBLE_DRIVER; } @@ -125,7 +124,7 @@ static VkResult macdrv_vulkan_surface_create(VkInstance instance, mac_surface->device = macdrv_create_metal_device(); if (!mac_surface->device) { - ERR("Failed to allocate Metal device for hwnd=%p\n", create_info->hwnd); + ERR("Failed to allocate Metal device for hwnd=%p\n", hwnd); res = VK_ERROR_OUT_OF_HOST_MEMORY; goto err; } @@ -133,7 +132,7 @@ static VkResult macdrv_vulkan_surface_create(VkInstance instance, mac_surface->view = macdrv_view_create_metal_view(data->client_cocoa_view, mac_surface->device); if (!mac_surface->view) { - ERR("Failed to allocate Metal view for hwnd=%p\n", create_info->hwnd); + ERR("Failed to allocate Metal view for hwnd=%p\n", hwnd); /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ res = VK_ERROR_OUT_OF_HOST_MEMORY; @@ -179,11 +178,11 @@ err: return res; } -static void macdrv_vulkan_surface_destroy(VkInstance instance, VkSurfaceKHR surface) +static void macdrv_vulkan_surface_destroy(HWND hwnd, VkInstance instance, VkSurfaceKHR surface) { struct wine_vk_surface *mac_surface = surface_from_handle(surface); - TRACE("%p 0x%s\n", instance, wine_dbgstr_longlong(surface)); + TRACE("%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface)); wine_vk_surface_destroy(instance, mac_surface); } diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index e24c344606e..87d2be0042c 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -94,16 +94,14 @@ static void wine_vk_surface_destroy(struct wine_vk_surface *wine_vk_surface) free(wine_vk_surface); } -static VkResult wayland_vulkan_surface_create(VkInstance instance, - const VkWin32SurfaceCreateInfoKHR *create_info, - VkSurfaceKHR *vk_surface) +static VkResult wayland_vulkan_surface_create(HWND hwnd, VkInstance instance, VkSurfaceKHR *vk_surface) { VkResult res; VkWaylandSurfaceCreateInfoKHR create_info_host; struct wine_vk_surface *wine_vk_surface; struct wayland_surface *wayland_surface; - TRACE("%p %p %p\n", instance, create_info, vk_surface); + TRACE("%p %p %p\n", hwnd, instance, vk_surface); wine_vk_surface = calloc(1, sizeof(*wine_vk_surface)); if (!wine_vk_surface) @@ -113,10 +111,10 @@ static VkResult wayland_vulkan_surface_create(VkInstance instance, goto err; } - wayland_surface = wayland_surface_lock_hwnd(create_info->hwnd); + wayland_surface = wayland_surface_lock_hwnd(hwnd); if (!wayland_surface) { - ERR("Failed to find wayland surface for hwnd=%p\n", create_info->hwnd); + ERR("Failed to find wayland surface for hwnd=%p\n", hwnd); /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ res = VK_ERROR_OUT_OF_HOST_MEMORY; goto err; @@ -127,7 +125,7 @@ static VkResult wayland_vulkan_surface_create(VkInstance instance, if (!wine_vk_surface->client) { - ERR("Failed to create client surface for hwnd=%p\n", create_info->hwnd); + ERR("Failed to create client surface for hwnd=%p\n", hwnd); /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ res = VK_ERROR_OUT_OF_HOST_MEMORY; goto err; @@ -158,11 +156,11 @@ err: return res; } -static void wayland_vulkan_surface_destroy(VkInstance instance, VkSurfaceKHR surface) +static void wayland_vulkan_surface_destroy(HWND hwnd, VkInstance instance, VkSurfaceKHR surface) { struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface); - TRACE("%p 0x%s\n", instance, wine_dbgstr_longlong(surface)); + TRACE("%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface)); pvkDestroySurfaceKHR(instance, wine_vk_surface->host_surface, NULL /* allocator */); wine_vk_surface_destroy(wine_vk_surface); diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 534f88f515c..2c457f1282f 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -132,16 +132,16 @@ void vulkan_thread_detach(void) pthread_mutex_unlock(&vulkan_mutex); } -static VkResult X11DRV_vulkan_surface_create( VkInstance instance, const VkWin32SurfaceCreateInfoKHR *create_info, VkSurfaceKHR *surface ) +static VkResult X11DRV_vulkan_surface_create( HWND hwnd, VkInstance instance, VkSurfaceKHR *surface ) { VkResult res; VkXlibSurfaceCreateInfoKHR create_info_host; struct wine_vk_surface *x11_surface; - TRACE( "%p %p %p\n", instance, create_info, surface ); + TRACE( "%p %p %p\n", hwnd, instance, surface ); /* TODO: support child window rendering. */ - if (NtUserGetAncestor( create_info->hwnd, GA_PARENT ) != NtUserGetDesktopWindow()) + if (NtUserGetAncestor( hwnd, GA_PARENT ) != NtUserGetDesktopWindow()) { FIXME("Application requires child window rendering, which is not implemented yet!\n"); return VK_ERROR_INCOMPATIBLE_DRIVER; @@ -152,13 +152,13 @@ static VkResult X11DRV_vulkan_surface_create( VkInstance instance, const VkWin32 return VK_ERROR_OUT_OF_HOST_MEMORY; x11_surface->ref = 1; - x11_surface->hwnd = create_info->hwnd; - x11_surface->window = create_client_window( create_info->hwnd, &default_visual, default_colormap ); + x11_surface->hwnd = hwnd; + x11_surface->window = create_client_window( hwnd, &default_visual, default_colormap ); x11_surface->hwnd_thread_id = NtUserGetWindowThread( x11_surface->hwnd, NULL ); if (!x11_surface->window) { - ERR("Failed to allocate client window for hwnd=%p\n", create_info->hwnd); + ERR( "Failed to allocate client window for hwnd=%p\n", hwnd ); /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ free(x11_surface); @@ -190,11 +190,11 @@ static VkResult X11DRV_vulkan_surface_create( VkInstance instance, const VkWin32 return VK_SUCCESS; } -static void X11DRV_vulkan_surface_destroy( VkInstance instance, VkSurfaceKHR surface ) +static void X11DRV_vulkan_surface_destroy( HWND hwnd, VkInstance instance, VkSurfaceKHR surface ) { struct wine_vk_surface *x11_surface = surface_from_handle(surface); - TRACE( "%p 0x%s\n", instance, wine_dbgstr_longlong(surface) ); + TRACE( "%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface) ); pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); wine_vk_surface_release(x11_surface); diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 241650e2496..32cd2a771d5 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 30 +#define WINE_VULKAN_DRIVER_VERSION 31 struct vulkan_funcs { @@ -44,8 +44,8 @@ struct vulkan_funcs /* interface between win32u and the user drivers */ struct vulkan_driver_funcs { - VkResult (*p_vulkan_surface_create)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, VkSurfaceKHR *); - void (*p_vulkan_surface_destroy)(VkInstance, VkSurfaceKHR); + VkResult (*p_vulkan_surface_create)(HWND, VkInstance, VkSurfaceKHR *); + void (*p_vulkan_surface_destroy)(HWND, VkInstance, VkSurfaceKHR); void (*p_vulkan_surface_presented)(HWND, VkResult); VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/vulkan.c | 9 ++++++--- dlls/winemac.drv/vulkan.c | 14 +++++--------- dlls/winewayland.drv/vulkan.c | 7 ++----- dlls/winex11.drv/vulkan.c | 7 ++----- include/wine/vulkan_driver.h | 4 ++-- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index d2323265db9..bd039b934ce 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -44,6 +44,7 @@ static void *vulkan_handle; static const struct vulkan_driver_funcs *driver_funcs; static struct vulkan_funcs vulkan_funcs; +static void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); static void *(*p_vkGetDeviceProcAddr)(VkDevice, const char *); static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); @@ -94,7 +95,8 @@ static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle TRACE( "instance %p, handle 0x%s, allocator %p\n", instance, wine_dbgstr_longlong(handle), allocator ); if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); - driver_funcs->p_vulkan_surface_destroy( surface->hwnd, instance, surface->driver_surface ); + p_vkDestroySurfaceKHR( instance, surface->host_surface, NULL /* allocator */ ); + driver_funcs->p_vulkan_surface_destroy( surface->hwnd, surface->driver_surface ); free( surface ); } @@ -168,7 +170,7 @@ static VkResult nulldrv_vulkan_surface_create( HWND hwnd, VkInstance instance, V return VK_ERROR_INCOMPATIBLE_DRIVER; } -static void nulldrv_vulkan_surface_destroy( HWND hwnd, VkInstance instance, VkSurfaceKHR surface ) +static void nulldrv_vulkan_surface_destroy( HWND hwnd, VkSurfaceKHR surface ) { } @@ -237,9 +239,10 @@ static void vulkan_init(void) return; \ } + LOAD_FUNCPTR( vkDestroySurfaceKHR ); + LOAD_FUNCPTR( vkQueuePresentKHR ); LOAD_FUNCPTR( vkGetDeviceProcAddr ); LOAD_FUNCPTR( vkGetInstanceProcAddr ); - LOAD_FUNCPTR( vkQueuePresentKHR ); #undef LOAD_FUNCPTR } diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 465389fff46..42e95d91cce 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -77,7 +77,6 @@ typedef struct VkMetalSurfaceCreateInfoEXT static VkResult (*pvkCreateMacOSSurfaceMVK)(VkInstance, const VkMacOSSurfaceCreateInfoMVK*, const VkAllocationCallbacks *, VkSurfaceKHR *); static VkResult (*pvkCreateMetalSurfaceEXT)(VkInstance, const VkMetalSurfaceCreateInfoEXT*, const VkAllocationCallbacks *, VkSurfaceKHR *); -static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *); static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs; @@ -87,10 +86,8 @@ static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) return (struct wine_vk_surface *)(uintptr_t)handle; } -static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface *surface) +static void wine_vk_surface_destroy(struct wine_vk_surface *surface) { - pvkDestroySurfaceKHR(instance, surface->host_surface, NULL /* allocator */); - if (surface->view) macdrv_view_release_metal_view(surface->view); @@ -173,18 +170,18 @@ static VkResult macdrv_vulkan_surface_create(HWND hwnd, VkInstance instance, VkS return VK_SUCCESS; err: - wine_vk_surface_destroy(instance, mac_surface); + wine_vk_surface_destroy(mac_surface); release_win_data(data); return res; } -static void macdrv_vulkan_surface_destroy(HWND hwnd, VkInstance instance, VkSurfaceKHR surface) +static void macdrv_vulkan_surface_destroy(HWND hwnd, VkSurfaceKHR surface) { struct wine_vk_surface *mac_surface = surface_from_handle(surface); - TRACE("%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface)); + TRACE("%p 0x%s\n", hwnd, wine_dbgstr_longlong(surface)); - wine_vk_surface_destroy(instance, mac_surface); + wine_vk_surface_destroy(mac_surface); } static void macdrv_vulkan_surface_presented(HWND hwnd, VkResult result) @@ -235,7 +232,6 @@ UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_dr #define LOAD_FUNCPTR(f) if ((p##f = dlsym(vulkan_handle, #f)) == NULL) return STATUS_PROCEDURE_NOT_FOUND; LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) LOAD_FUNCPTR(vkCreateMetalSurfaceEXT) - LOAD_FUNCPTR(vkDestroySurfaceKHR) #undef LOAD_FUNCPTR *driver_funcs = &macdrv_vulkan_driver_funcs; diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 87d2be0042c..403da808fb5 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -54,7 +54,6 @@ typedef struct VkWaylandSurfaceCreateInfoKHR } VkWaylandSurfaceCreateInfoKHR; static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); -static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice, uint32_t, struct wl_display *); static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs; @@ -156,13 +155,12 @@ err: return res; } -static void wayland_vulkan_surface_destroy(HWND hwnd, VkInstance instance, VkSurfaceKHR surface) +static void wayland_vulkan_surface_destroy(HWND hwnd, VkSurfaceKHR surface) { struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface); - TRACE("%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface)); + TRACE("%p 0x%s\n", hwnd, wine_dbgstr_longlong(surface)); - pvkDestroySurfaceKHR(instance, wine_vk_surface->host_surface, NULL /* allocator */); wine_vk_surface_destroy(wine_vk_surface); } @@ -230,7 +228,6 @@ UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_d #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) return STATUS_PROCEDURE_NOT_FOUND; LOAD_FUNCPTR(vkCreateWaylandSurfaceKHR); - LOAD_FUNCPTR(vkDestroySurfaceKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceWaylandPresentationSupportKHR); #undef LOAD_FUNCPTR diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 2c457f1282f..a49afd32a2c 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -74,7 +74,6 @@ typedef struct VkXlibSurfaceCreateInfoKHR } VkXlibSurfaceCreateInfoKHR; static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); -static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice, uint32_t, Display *, VisualID); static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs; @@ -190,13 +189,12 @@ static VkResult X11DRV_vulkan_surface_create( HWND hwnd, VkInstance instance, Vk return VK_SUCCESS; } -static void X11DRV_vulkan_surface_destroy( HWND hwnd, VkInstance instance, VkSurfaceKHR surface ) +static void X11DRV_vulkan_surface_destroy( HWND hwnd, VkSurfaceKHR surface ) { struct wine_vk_surface *x11_surface = surface_from_handle(surface); - TRACE( "%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface) ); + TRACE( "%p 0x%s\n", hwnd, wine_dbgstr_longlong(surface) ); - pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); wine_vk_surface_release(x11_surface); } @@ -250,7 +248,6 @@ UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_d #define LOAD_FUNCPTR( f ) if (!(p##f = dlsym( vulkan_handle, #f ))) return STATUS_PROCEDURE_NOT_FOUND; LOAD_FUNCPTR( vkCreateXlibSurfaceKHR ); - LOAD_FUNCPTR( vkDestroySurfaceKHR ); LOAD_FUNCPTR( vkGetPhysicalDeviceXlibPresentationSupportKHR ); #undef LOAD_FUNCPTR diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 32cd2a771d5..20931374ce2 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 31 +#define WINE_VULKAN_DRIVER_VERSION 32 struct vulkan_funcs { @@ -45,7 +45,7 @@ struct vulkan_funcs struct vulkan_driver_funcs { VkResult (*p_vulkan_surface_create)(HWND, VkInstance, VkSurfaceKHR *); - void (*p_vulkan_surface_destroy)(HWND, VkInstance, VkSurfaceKHR); + void (*p_vulkan_surface_destroy)(HWND, VkSurfaceKHR); void (*p_vulkan_surface_presented)(HWND, VkResult); VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
Maybe we should just move `ThreadDetach` call in win32u after `destroy_thread_windows()`?
I'll try that, in a separate MR. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5491#note_68828
I've stripped this MR down to the first set of changes, I'll split the rest to another one later. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5491#note_68829
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5491
participants (2)
-
Jacek Caban (＠jacek) -
Rémi Bernon