From 97222bcd368f374b6eb8ba2e09e538c9f04c12f0 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 8 Jun 2021 15:18:52 -0700 Subject: [PATCH] freedreno: Move assert The batch can be flushed immediately after unlocking, so this assert needs to move. Signed-off-by: Rob Clark Part-of: --- src/gallium/drivers/freedreno/freedreno_batch.c | 2 -- src/gallium/drivers/freedreno/freedreno_draw.c | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c index e1704d09723..3abe60d9094 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.c +++ b/src/gallium/drivers/freedreno/freedreno_batch.c @@ -535,8 +535,6 @@ fd_batch_resource_read_slowpath(struct fd_batch *batch, struct fd_resource *rsc) void fd_batch_check_size(struct fd_batch *batch) { - debug_assert(!batch->flushed); - if (FD_DBG(FLUSH)) { fd_batch_flush(batch); return; diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index 56e653aa3bc..ab40b3ac609 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -378,6 +378,8 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info, if (FD_DBG(DDRAW)) fd_context_all_dirty(ctx); + debug_assert(!batch->flushed); + fd_batch_unlock_submit(batch); fd_batch_check_size(batch); fd_batch_reference(&batch, NULL); @@ -494,6 +496,8 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, } } + debug_assert(!batch->flushed); + fd_batch_unlock_submit(batch); fd_batch_check_size(batch);