vulkan/wsi: Add a helper for AcquireNextImage

Unfortunately, due to the fact that AcquireNextImage does not take a
queue, the ANV trick for triggering the fence won't work in general.  We
leave dealing with the fence up to the caller for now.

Reviewed-by: Dave Airlie <[email protected]>
Reviewed-by: Chad Versace <[email protected]>

1 files changed, 11 insertions, 8 deletions

diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
index 62368a10a06..6f5aaf6b704 100644
--- a/src/intel/vulkan/anv_wsi.c
+++ b/src/intel/vulkan/anv_wsi.c
@@ -234,24 +234,27 @@ VkResult anv_GetSwapchainImagesKHR(
 
 VkResult anv_AcquireNextImageKHR(
     VkDevice                                     _device,
-    VkSwapchainKHR                               _swapchain,
+    VkSwapchainKHR                               swapchain,
     uint64_t                                     timeout,
     VkSemaphore                                  semaphore,
-    VkFence                                      _fence,
+    VkFence                                      fence,
     uint32_t*                                    pImageIndex)
 {
    ANV_FROM_HANDLE(anv_device, device, _device);
-   ANV_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
-   ANV_FROM_HANDLE(anv_fence, fence, _fence);
+   struct anv_physical_device *pdevice = &device->instance->physicalDevice;
 
-   VkResult result = swapchain->acquire_next_image(swapchain, timeout,
-                                                   semaphore, pImageIndex);
+   VkResult result = wsi_common_acquire_next_image(&pdevice->wsi_device,
+                                                   _device,
+                                                   swapchain,
+                                                   timeout,
+                                                   semaphore,
+                                                   pImageIndex);
 
    /* Thanks to implicit sync, the image is ready immediately.  However, we
     * should wait for the current GPU state to finish.
     */
-   if (fence)
-      anv_QueueSubmit(anv_queue_to_handle(&device->queue), 0, NULL, _fence);
+   if (fence != VK_NULL_HANDLE)
+      anv_QueueSubmit(anv_queue_to_handle(&device->queue), 0, NULL, fence);
 
    return result;
 }