Alexandros Frantzis : winewayland.drv: Implement vkQueuePresentKHR.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8a4e2546f57e0e35eef0abfa55b234434206ff14
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8a4e2546f57e0e35eef0abfa55b2344...

Author: Alexandros Frantzis 
Date:   Fri Sep 17 13:22:11 2021 +0300

winewayland.drv: Implement vkQueuePresentKHR.

---

dlls/winewayland.drv/vulkan.c          | 10 ++++++++++
 dlls/winewayland.drv/wayland_surface.c |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c
index 5ecf3787656..7f73286ec5f 100644
--- a/dlls/winewayland.drv/vulkan.c
+++ b/dlls/winewayland.drv/vulkan.c
@@ -68,6 +68,7 @@ static VkResult (*pvkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice,
 static VkResult (*pvkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *);
 static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice, uint32_t, struct wl_display *);
 static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *);
+static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *);

static void *vulkan_handle;
 static const struct vulkan_funcs vulkan_funcs;
@@ -633,6 +634,13 @@ static VkResult wayland_vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR
     return pvkGetSwapchainImagesKHR(device, swapchain, count, images);
 }

+static VkResult wayland_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info)
+{
+    TRACE("%p, %p\n", queue, present_info);
+
+    return pvkQueuePresentKHR(queue, present_info);
+}
+
 static VkSurfaceKHR wayland_wine_get_native_surface(VkSurfaceKHR surface)
 {
     return wine_vk_surface_from_handle(surface)->native;
@@ -665,6 +673,7 @@ static void wine_vk_init(void)
     LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR);
     LOAD_FUNCPTR(vkGetPhysicalDeviceWaylandPresentationSupportKHR);
     LOAD_FUNCPTR(vkGetSwapchainImagesKHR);
+    LOAD_FUNCPTR(vkQueuePresentKHR);
 #undef LOAD_FUNCPTR
 #undef LOAD_OPTIONAL_FUNCPTR

@@ -694,6 +703,7 @@ static const struct vulkan_funcs vulkan_funcs =
     .p_vkGetPhysicalDeviceSurfaceSupportKHR = wayland_vkGetPhysicalDeviceSurfaceSupportKHR,
     .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR,
     .p_vkGetSwapchainImagesKHR = wayland_vkGetSwapchainImagesKHR,
+    .p_vkQueuePresentKHR = wayland_vkQueuePresentKHR,
     .p_wine_get_native_surface = wayland_wine_get_native_surface,
 };

diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c
index 5a808b3ac96..f71e15f2f9a 100644
--- a/dlls/winewayland.drv/wayland_surface.c
+++ b/dlls/winewayland.drv/wayland_surface.c
@@ -803,6 +803,8 @@ struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface
         ERR("Failed to create client wl_subsurface\n");
         goto err;
     }
+    /* Present contents independently of the parent surface. */
+    wl_subsurface_set_desync(surface->client->wl_subsurface);

if (process_wayland.wp_viewporter)
     {