Mesa (master): lavapipe: fix wsi acquire fences

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f24645653863564eb059c1200a52b25f659216e5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f24645653863564eb059c1200a52b25f659216e5

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 16 10:02:17 2020 +1000

lavapipe: fix wsi acquire fences

Fixes:
dEQP-VK.wsi.xcb.swapchain.acquire.too_many

Cc: "20.3" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7705>

---

 src/gallium/frontends/lavapipe/lvp_wsi.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_wsi.c b/src/gallium/frontends/lavapipe/lvp_wsi.c
index 95aad8ce532..54964bf4b66 100644
--- a/src/gallium/frontends/lavapipe/lvp_wsi.c
+++ b/src/gallium/frontends/lavapipe/lvp_wsi.c
@@ -213,19 +213,12 @@ VkResult lvp_AcquireNextImage2KHR(
                                                     _device,
                                                     pAcquireInfo,
                                                     pImageIndex);
-#if 0
+
    LVP_FROM_HANDLE(lvp_fence, fence, pAcquireInfo->fence);
 
    if (fence && (result == VK_SUCCESS || result == VK_SUBOPTIMAL_KHR)) {
-      if (fence->fence)
-         device->ws->signal_fence(fence->fence);
-      if (fence->temp_syncobj) {
-         device->ws->signal_syncobj(device->ws, fence->temp_syncobj);
-      } else if (fence->syncobj) {
-         device->ws->signal_syncobj(device->ws, fence->syncobj);
-      }
+      fence->signaled = true;
    }
-#endif
    return result;
 }