Mesa (main): Revert "lvp/fence: quick fix to previous commit."

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Oct 6 21:06:27 UTC 2021


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Oct  7 05:39:05 2021 +1000

Revert "lvp/fence: quick fix to previous commit."

This reverts commit 028591954a2d7e1c3cf8ecec04f1555564dd8076.

This wasn't the correct fix, that is coming up.

Fixes: 028591954a2d7 ("lvp/fence: quick fix to previous commit.")
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13218>

---

 src/gallium/frontends/lavapipe/lvp_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index aec863da973..fe1f7db8a59 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -2198,7 +2198,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_WaitForFences(
          struct lvp_fence *f = lvp_fence_from_handle(pFences[i]);
 
          /* this is an unsubmitted fence: immediately bail out */
-         if (!f->timeline && !f->signalled && !f->handle)
+         if (!f->timeline && !f->signalled)
             return VK_TIMEOUT;
          if (!fence || f->timeline > fence->timeline)
             fence = f;



More information about the mesa-commit mailing list