From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/vulkan.c | 8 ++++---- dlls/winemac.drv/vulkan.c | 2 +- dlls/winewayland.drv/vulkan.c | 2 +- dlls/winex11.drv/vulkan.c | 2 +- include/wine/vulkan_driver.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 471a4459ec3..d285b07b951 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -127,7 +127,7 @@ static VkResult win32u_vkQueuePresentKHR( VkQueue queue, const VkPresentInfoKHR VkResult swapchain_res = present_info->pResults ? present_info->pResults[i] : res; struct surface *surface = surface_from_handle( surfaces[i] );
- driver_funcs->p_vulkan_surface_presented( surface->hwnd, swapchain_res ); + driver_funcs->p_vulkan_surface_presented( surface->hwnd, surface->driver_private, swapchain_res ); }
return res; @@ -191,7 +191,7 @@ static void nulldrv_vulkan_surface_detach( HWND hwnd, void *private ) { }
-static void nulldrv_vulkan_surface_presented( HWND hwnd, VkResult result ) +static void nulldrv_vulkan_surface_presented( HWND hwnd, void *private, VkResult result ) { }
@@ -259,10 +259,10 @@ static void lazydrv_vulkan_surface_detach( HWND hwnd, void *private ) return driver_funcs->p_vulkan_surface_detach( hwnd, private ); }
-static void lazydrv_vulkan_surface_presented( HWND hwnd, VkResult result ) +static void lazydrv_vulkan_surface_presented( HWND hwnd, void *private, VkResult result ) { vulkan_driver_load(); - return driver_funcs->p_vulkan_surface_presented( hwnd, result ); + driver_funcs->p_vulkan_surface_presented( hwnd, private, result ); }
static VkBool32 lazydrv_vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice device, uint32_t queue ) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d5a3df579d0..3c6c5ee5b7f 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -182,7 +182,7 @@ static void macdrv_vulkan_surface_detach(HWND hwnd, void *private) { }
-static void macdrv_vulkan_surface_presented(HWND hwnd, VkResult result) +static void macdrv_vulkan_surface_presented(HWND hwnd, void *private, VkResult result) { }
diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 7a075a925b7..25a6117cb45 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -132,7 +132,7 @@ static void wayland_vulkan_surface_detach(HWND hwnd, void *private) { }
-static void wayland_vulkan_surface_presented(HWND hwnd, VkResult result) +static void wayland_vulkan_surface_presented(HWND hwnd, void *private, VkResult result) { ensure_window_surface_contents(hwnd); } diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 85993bc517a..7d41d482c8e 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -123,7 +123,7 @@ static void X11DRV_vulkan_surface_detach( HWND hwnd, void *private ) } }
-static void X11DRV_vulkan_surface_presented(HWND hwnd, VkResult result) +static void X11DRV_vulkan_surface_presented( HWND hwnd, void *private, VkResult result ) { }
diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 7ddba4739f4..3b1f20fda80 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -47,7 +47,7 @@ struct vulkan_driver_funcs VkResult (*p_vulkan_surface_create)(HWND, VkInstance, VkSurfaceKHR *, void **); void (*p_vulkan_surface_destroy)(HWND, void *); void (*p_vulkan_surface_detach)(HWND, void *); - void (*p_vulkan_surface_presented)(HWND, VkResult); + void (*p_vulkan_surface_presented)(HWND, void *, VkResult);
VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); const char *(*p_get_host_surface_extension)(void);