From fec07a664ea49eab21eea39285eba590a632c787 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 2 Nov 2020 12:23:13 -0500 Subject: [PATCH] zink: rework public batch flush function to be useful again Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_context.c | 7 +++---- src/gallium/drivers/zink/zink_context.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 4f619e6789a..577180a4a2c 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1370,11 +1370,10 @@ zink_flush_compute(struct zink_context *ctx) flush_batch(ctx, ZINK_QUEUE_COMPUTE); } -struct zink_batch * -zink_flush_batch(struct zink_context *ctx, struct zink_batch *batch) +void +zink_flush_queue(struct zink_context *ctx, enum zink_queue queue) { - flush_batch(ctx, batch->queue); - return batch; + flush_batch(ctx, queue); } static void diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h index 51eb4d3c14f..8f296b16612 100644 --- a/src/gallium/drivers/zink/zink_context.h +++ b/src/gallium/drivers/zink/zink_context.h @@ -263,8 +263,8 @@ zink_wait_on_batch(struct zink_context *ctx, enum zink_queue queue, uint32_t bat void zink_flush_compute(struct zink_context *ctx); -struct zink_batch * -zink_flush_batch(struct zink_context *ctx, struct zink_batch *batch); +void +zink_flush_queue(struct zink_context *ctx, enum zink_queue queue); void zink_maybe_flush_or_stall(struct zink_context *ctx, enum zink_queue queue);