From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 2 Nov 2016 21:45:37 +0000 (-0700)
Subject: anv/wsi: Set the fence to signaled in AcquireNextImageKHR
X-Git-Tag: android-x86-6.0-r3~2159
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=73701be667ae408772bf20cb504b70d1775d4a4b;p=android-x86%2Fexternal-mesa.git

anv/wsi: Set the fence to signaled in AcquireNextImageKHR

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Chad Versace <chadversary@chromium.org>
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
index 064581d5d38..61d5db07979 100644
--- a/src/intel/vulkan/anv_wsi.c
+++ b/src/intel/vulkan/anv_wsi.c
@@ -323,13 +323,20 @@ VkResult anv_AcquireNextImageKHR(
     VkSwapchainKHR                               _swapchain,
     uint64_t                                     timeout,
     VkSemaphore                                  semaphore,
-    VkFence                                      fence,
+    VkFence                                      _fence,
     uint32_t*                                    pImageIndex)
 {
    ANV_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
+   ANV_FROM_HANDLE(anv_fence, fence, _fence);
 
-   return swapchain->acquire_next_image(swapchain, timeout, semaphore,
-                                        pImageIndex);
+   VkResult result = swapchain->acquire_next_image(swapchain, timeout,
+                                                   semaphore, pImageIndex);
+
+   /* Thanks to implicit sync, the image is ready immediately. */
+   if (fence)
+      fence->ready = true;
+
+   return result;
 }
 
 VkResult anv_QueuePresentKHR(