winevulkan: Skip present waits when the window is not visible.

Author: BananaWorks07

dlls/win32u/vulkan.c

@@ -3019,6 +3019,41 @@ static VkResult win32u_vkAcquireNextImageKHR( VkDevice client_device, VkSwapchai
     return res;
 }
 
+static BOOL should_skip_wait( HWND hwnd )
+{
+    if (!NtUserIsWindowVisible( hwnd ))
+    {
+        WARN( "hwnd=%p not yet visible!\n", hwnd );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static VkResult win32u_vkWaitForPresentKHR( VkDevice client_device, VkSwapchainKHR client_swapchain,
+                                            uint64_t presentId, uint64_t timeout )
+{
+    struct vulkan_device *device = vulkan_device_from_handle( client_device );
+    struct swapchain *swapchain = swapchain_from_handle( client_swapchain );
+
+    if (swapchain->surface && should_skip_wait( swapchain->surface->hwnd ))
+        return VK_SUCCESS;
+
+    return device->p_vkWaitForPresentKHR( device->host.device, swapchain->obj.host.swapchain, presentId, timeout );
+}
+
+static VkResult win32u_vkWaitForPresent2KHR( VkDevice client_device, VkSwapchainKHR client_swapchain,
+                                             const VkPresentWait2InfoKHR *info )
+{
+    struct vulkan_device *device = vulkan_device_from_handle( client_device );
+    struct swapchain *swapchain = swapchain_from_handle( client_swapchain );
+
+    if (swapchain->surface && should_skip_wait( swapchain->surface->hwnd ))
+        return VK_SUCCESS;
+
+    return device->p_vkWaitForPresent2KHR( device->host.device, swapchain->obj.host.swapchain, info );
+}
+
 static VkResult win32u_vkGetSwapchainImagesKHR( VkDevice client_device, VkSwapchainKHR client_swapchain,
                                                 uint32_t *count, VkImage *images )
 {
@@ -4382,6 +4417,8 @@ static struct vulkan_funcs vulkan_funcs =
     .p_vkQueueSubmit2KHR = win32u_vkQueueSubmit2KHR,
     .p_vkUnmapMemory = win32u_vkUnmapMemory,
     .p_vkUnmapMemory2KHR = win32u_vkUnmapMemory2KHR,
+    .p_vkWaitForPresentKHR = win32u_vkWaitForPresentKHR,
+    .p_vkWaitForPresent2KHR = win32u_vkWaitForPresent2KHR,
 };
 
 static VkResult nulldrv_vulkan_surface_create( HWND hwnd, BOOL raw, const struct vulkan_instance *instance,

dlls/winevulkan/make_vulkan

@@ -240,6 +240,8 @@ USER_DRIVER_FUNCS = {
     "vkQueueSubmit2KHR",
     "vkUnmapMemory",
     "vkUnmapMemory2KHR",
+    "vkWaitForPresentKHR",
+    "vkWaitForPresent2KHR",
 }
 
 # functions for which the unix thunk is manually implemented

include/wine/vulkan_driver.h

@@ -361,6 +361,8 @@ struct vulkan_funcs
     PFN_vkQueueSubmit2KHR p_vkQueueSubmit2KHR;
     PFN_vkUnmapMemory p_vkUnmapMemory;
     PFN_vkUnmapMemory2KHR p_vkUnmapMemory2KHR;
+    PFN_vkWaitForPresentKHR p_vkWaitForPresentKHR;
+    PFN_vkWaitForPresent2KHR p_vkWaitForPresent2KHR;
 };
 
 /* interface between win32u and the user drivers */