commit 904811faacc8cb88229be084e10f4fe3131af796
author Dave Airlie <airlied@redhat.com> Mon Nov 16 10:02:17 2020 +1000
committer Dylan Baker <dylan.c.baker@intel.com> Tue Nov 24 22:08:20 2020 -0800
tree 5fec83e94da122e041d3449fb9fc38023c431acc
parent 6e3894d52d18e3e5ac8029d260168ed9c33693b3

lavapipe: fix wsi acquire fences

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

Cc: "20.3" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7705>
(cherry picked from commit f24645653863564eb059c1200a52b25f659216e5)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 9569b53..06cbd3c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -634,7 +634,7 @@
         "description": "lavapipe: fix wsi acquire fences",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },

src/gallium/frontends/lavapipe/lvp_wsi.c

diff --git a/src/gallium/frontends/lavapipe/lvp_wsi.c b/src/gallium/frontends/lavapipe/lvp_wsi.c
index 95aad8c..54964bf 100644
--- a/src/gallium/frontends/lavapipe/lvp_wsi.c
+++ b/src/gallium/frontends/lavapipe/lvp_wsi.c
@@ -213,19 +213,12 @@
                                                     _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;
 }