From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/vulkan.c | 12 ++++++------ dlls/winemac.drv/vulkan.c | 6 +++--- dlls/winewayland.drv/vulkan.c | 10 +++++----- dlls/winex11.drv/vulkan.c | 12 +++++------- include/wine/vulkan_driver.h | 2 +- 5 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 6d6e5f81f54..9cd5a533060 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -266,7 +266,7 @@ static VkResult win32u_vkGetPhysicalDeviceSurfaceFormats2KHR( VkPhysicalDevice c static VkBool32 win32u_vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice client_physical_device, uint32_t queue ) { struct vulkan_physical_device *physical_device = vulkan_physical_device_from_handle( client_physical_device ); - return driver_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR( physical_device->host.physical_device, queue ); + return driver_funcs->p_get_physical_device_presentation_support( physical_device, queue ); }
static BOOL extents_equals( const VkExtent2D *extents, const RECT *rect ) @@ -515,7 +515,7 @@ static VkResult nulldrv_vulkan_surface_create( HWND hwnd, const struct vulkan_in return res; }
-static VkBool32 nulldrv_vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice device, uint32_t queue ) +static VkBool32 nulldrv_get_physical_device_presentation_support( struct vulkan_physical_device *physical_device, uint32_t queue ) { return VK_TRUE; } @@ -528,7 +528,7 @@ static const char *nulldrv_get_host_surface_extension(void) static const struct vulkan_driver_funcs nulldrv_funcs = { .p_vulkan_surface_create = nulldrv_vulkan_surface_create, - .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = nulldrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_physical_device_presentation_support = nulldrv_get_physical_device_presentation_support, .p_get_host_surface_extension = nulldrv_get_host_surface_extension, };
@@ -560,10 +560,10 @@ static VkResult lazydrv_vulkan_surface_create( HWND hwnd, const struct vulkan_in return driver_funcs->p_vulkan_surface_create( hwnd, instance, surface, client ); }
-static VkBool32 lazydrv_vkGetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice device, uint32_t queue ) +static VkBool32 lazydrv_get_physical_device_presentation_support( struct vulkan_physical_device *physical_device, uint32_t queue ) { vulkan_driver_load(); - return driver_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR( device, queue ); + return driver_funcs->p_get_physical_device_presentation_support( physical_device, queue ); }
static const char *lazydrv_get_host_surface_extension(void) @@ -575,7 +575,7 @@ static const char *lazydrv_get_host_surface_extension(void) static const struct vulkan_driver_funcs lazydrv_funcs = { .p_vulkan_surface_create = lazydrv_vulkan_surface_create, - .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = lazydrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_physical_device_presentation_support = lazydrv_get_physical_device_presentation_support, .p_get_host_surface_extension = lazydrv_get_host_surface_extension, };
diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index c67b007705a..77c85476dc7 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -117,10 +117,10 @@ err: return VK_ERROR_INCOMPATIBLE_DRIVER; }
-static VkBool32 macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, +static VkBool32 macdrv_get_physical_device_presentation_support(struct vulkan_physical_device *physical_device, uint32_t index) { - TRACE("%p %u\n", phys_dev, index); + TRACE("%p %u\n", physical_device, index);
return VK_TRUE; } @@ -133,7 +133,7 @@ static const char *macdrv_get_host_surface_extension(void) static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs = { .p_vulkan_surface_create = macdrv_vulkan_surface_create, - .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_physical_device_presentation_support = macdrv_get_physical_device_presentation_support, .p_get_host_surface_extension = macdrv_get_host_surface_extension, };
diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index c6aa9342c09..e8d4f14727f 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -88,12 +88,12 @@ static VkResult wayland_vulkan_surface_create(HWND hwnd, const struct vulkan_ins return VK_SUCCESS; }
-static VkBool32 wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, - uint32_t index) +static VkBool32 wayland_get_physical_device_presentation_support(struct vulkan_physical_device *physical_device, + uint32_t index) { - TRACE("%p %u\n", phys_dev, index); + TRACE("%p %u\n", physical_device, index);
- return pvkGetPhysicalDeviceWaylandPresentationSupportKHR(phys_dev, index, + return pvkGetPhysicalDeviceWaylandPresentationSupportKHR(physical_device->host.physical_device, index, process_wayland.wl_display); }
@@ -105,7 +105,7 @@ static const char *wayland_get_host_surface_extension(void) static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs = { .p_vulkan_surface_create = wayland_vulkan_surface_create, - .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_physical_device_presentation_support = wayland_get_physical_device_presentation_support, .p_get_host_surface_extension = wayland_get_host_surface_extension, };
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 052ed7194a5..f482f41a1e4 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -85,13 +85,11 @@ static VkResult X11DRV_vulkan_surface_create( HWND hwnd, const struct vulkan_ins return VK_SUCCESS; }
-static VkBool32 X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, - uint32_t index) +static VkBool32 X11DRV_get_physical_device_presentation_support( struct vulkan_physical_device *physical_device, uint32_t index ) { - TRACE("%p %u\n", phys_dev, index); - - return pvkGetPhysicalDeviceXlibPresentationSupportKHR(phys_dev, index, gdi_display, - default_visual.visual->visualid); + TRACE( "%p %u\n", physical_device, index ); + return pvkGetPhysicalDeviceXlibPresentationSupportKHR( physical_device->host.physical_device, index, gdi_display, + default_visual.visual->visualid ); }
static const char *X11DRV_get_host_surface_extension(void) @@ -102,7 +100,7 @@ static const char *X11DRV_get_host_surface_extension(void) static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs = { .p_vulkan_surface_create = X11DRV_vulkan_surface_create, - .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_get_physical_device_presentation_support = X11DRV_get_physical_device_presentation_support, .p_get_host_surface_extension = X11DRV_get_host_surface_extension, };
diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 0579ea7773f..7484a91c315 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -179,7 +179,7 @@ struct client_surface; struct vulkan_driver_funcs { VkResult (*p_vulkan_surface_create)(HWND, const struct vulkan_instance *, VkSurfaceKHR *, struct client_surface **); - VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t); + VkBool32 (*p_get_physical_device_presentation_support)(struct vulkan_physical_device *, uint32_t); const char *(*p_get_host_surface_extension)(void); };