Mesa (main): freedreno: check batch size after the fallback blitter clear

[GitLab Mirror]

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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Thu Nov 11 17:29:43 2021 -0500

freedreno: check batch size after the fallback blitter clear

When force-flushing after every draw, this would otherwise hit a NULL
batch in fd_blitter_clear.

Tested on a4xx.

Suggested-by: Rob Clark <robdclark at chromium.org>
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13761>

---

 src/gallium/drivers/freedreno/freedreno_draw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c
index 1a7b0580efa..ec64adf1925 100644
--- a/src/gallium/drivers/freedreno/freedreno_draw.c
+++ b/src/gallium/drivers/freedreno/freedreno_draw.c
@@ -487,12 +487,13 @@ fd_clear(struct pipe_context *pctx, unsigned buffers,
    debug_assert(!batch->flushed);
 
    fd_batch_unlock_submit(batch);
-   fd_batch_check_size(batch);
 
    if (fallback) {
       fd_blitter_clear(pctx, buffers, color, depth, stencil);
    }
 
+   fd_batch_check_size(batch);
+
    fd_batch_reference(&batch, NULL);
 }