swr/rast: SIMD16 FE - primitive assembly simplification

[mesa.git] / src / gallium / drivers / vc4 / vc4_fence.c

diff --git a/src/gallium/drivers/vc4/vc4_fence.c b/src/gallium/drivers/vc4/vc4_fence.c
index 01906cdba0c438cd29a21d002151e6ece31507aa..f61e7c6a5e845884825c144aeeecd6d3bd85c514 100644 (file)
--- a/src/gallium/drivers/vc4/vc4_fence.c
+++ b/src/gallium/drivers/vc4/vc4_fence.c
@@ -59,31 +59,16 @@ vc4_fence_reference(struct pipe_screen *pscreen,
         *p = f;
 }
 
-static boolean
-vc4_fence_signalled(struct pipe_screen *pscreen,
-                    struct pipe_fence_handle *pf)
-{
-        struct vc4_screen *screen = vc4_screen(pscreen);
-        struct vc4_fence *f = (struct vc4_fence *)pf;
-
-        if (screen->finished_seqno >= f->seqno)
-                return true;
-
-        return vc4_wait_seqno(screen, f->seqno, 0);
-}
-
 static boolean
 vc4_fence_finish(struct pipe_screen *pscreen,
+                struct pipe_context *ctx,
                  struct pipe_fence_handle *pf,
                  uint64_t timeout_ns)
 {
         struct vc4_screen *screen = vc4_screen(pscreen);
         struct vc4_fence *f = (struct vc4_fence *)pf;
 
-        if (screen->finished_seqno >= f->seqno)
-                return true;
-
-        return vc4_wait_seqno(screen, f->seqno, timeout_ns);
+        return vc4_wait_seqno(screen, f->seqno, timeout_ns, "fence wait");
 }
 
 struct vc4_fence *
@@ -104,6 +89,5 @@ void
 vc4_fence_init(struct vc4_screen *screen)
 {
         screen->base.fence_reference = vc4_fence_reference;
-        screen->base.fence_signalled = vc4_fence_signalled;
         screen->base.fence_finish = vc4_fence_finish;
 }