freedreno: Fix flushes with NULL batch
authorRob Clark <robdclark@chromium.org>
Wed, 16 Jun 2021 17:20:05 +0000 (10:20 -0700)
committerMarge Bot <eric+marge@anholt.net>
Thu, 17 Jun 2021 19:34:50 +0000 (19:34 +0000)
Sequences that pctx->set_framebuffer_state() before pctx->flush() will
see ctx->batch being NULL.. but they still need to call fd_bc_flush(ctx)
to ensure pending batches associated with the context are flushed.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11402>

src/gallium/drivers/freedreno/freedreno_context.c

index 374a95a..1df7155 100644 (file)
@@ -57,6 +57,8 @@ fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fencep,
    if (fencep && !batch) {
       batch = fd_context_batch(ctx);
    } else if (!batch) {
+      if (ctx->screen->reorder)
+         fd_bc_flush(ctx, flags & PIPE_FLUSH_DEFERRED);
       fd_bc_dump(ctx, "%p: NULL batch, remaining:\n", ctx);
       return;
    }