From 5267efa259061539375725db313d9448d7cb5fd8 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 17 Jun 2022 10:14:00 -0400
Subject: [PATCH] zink: move draw-time barrier generation down a little

ensure that this occurs after potential rebind handling

Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-By: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17111>
---
 src/gallium/drivers/zink/zink_draw.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_draw.cpp b/src/gallium/drivers/zink/zink_draw.cpp
index d6820fb7497..af1f6775ef1 100644
--- a/src/gallium/drivers/zink/zink_draw.cpp
+++ b/src/gallium/drivers/zink/zink_draw.cpp
@@ -484,7 +484,6 @@ zink_draw(struct pipe_context *pctx,
 
    if (ctx->memory_barrier)
       zink_flush_memory_barrier(ctx, false);
-   update_barriers(ctx, false);
 
    if (unlikely(ctx->buffer_rebind_counter < screen->buffer_rebind_counter)) {
       ctx->buffer_rebind_counter = screen->buffer_rebind_counter;
@@ -530,6 +529,7 @@ zink_draw(struct pipe_context *pctx,
       }
    }
 
+   update_barriers(ctx, false);
    /* ensure synchronization between doing streamout with counter buffer
     * and using counter buffer for indirect draw
     */