From 8f687f2a46529206737385bce46b4b0507b2b42c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 8 May 2024 13:11:49 -0400 Subject: [PATCH] zink: rely on zink_get_cmdbuf() to set has_work flags Part-of: --- src/gallium/drivers/zink/zink_blit.c | 1 - src/gallium/drivers/zink/zink_clear.c | 1 - src/gallium/drivers/zink/zink_synchronization.cpp | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index 2a8d0c6f0a4..9bb4d37dad9 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -436,7 +436,6 @@ zink_blit(struct pipe_context *pctx, ctx->in_rp = false; ctx->rp_changed = true; ctx->queries_disabled = true; - ctx->bs->has_reordered_work = true; ctx->pipeline_changed[0] = true; zink_reset_ds3_states(ctx); zink_select_draw_vbo(ctx); diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c index a062c081ab4..754b37e63ae 100644 --- a/src/gallium/drivers/zink/zink_clear.c +++ b/src/gallium/drivers/zink/zink_clear.c @@ -717,7 +717,6 @@ fb_clears_apply_internal(struct zink_context *ctx, struct pipe_resource *pres, i ctx->bs->cmdbuf = ctx->bs->reordered_cmdbuf; ctx->rp_changed = true; ctx->queries_disabled = true; - ctx->bs->has_reordered_work = true; } /* this will automatically trigger all the clears */ zink_batch_rp(ctx); diff --git a/src/gallium/drivers/zink/zink_synchronization.cpp b/src/gallium/drivers/zink/zink_synchronization.cpp index c451ab4c43c..d68ec549f1b 100644 --- a/src/gallium/drivers/zink/zink_synchronization.cpp +++ b/src/gallium/drivers/zink/zink_synchronization.cpp @@ -290,9 +290,9 @@ zink_get_cmdbuf(struct zink_context *ctx, struct zink_resource *src, struct zink if (unordered_exec) { ctx->bs->has_reordered_work = true; - ctx->bs->has_work = true; return ctx->bs->reordered_cmdbuf; } + ctx->bs->has_work = true; return ctx->bs->cmdbuf; }