From f32891b159d8f725f9f9206c4a0d0144629b18d3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 12 Aug 2020 16:04:07 -0400 Subject: [PATCH] zink: ignore compute batch when starting/ending batches compute batches don't have queries Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/gallium/drivers/zink/zink_batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c index 359aa7113a6..ddc480d37e4 100644 --- a/src/gallium/drivers/zink/zink_batch.c +++ b/src/gallium/drivers/zink/zink_batch.c @@ -81,14 +81,14 @@ zink_start_batch(struct zink_context *ctx, struct zink_batch *batch) if (vkBeginCommandBuffer(batch->cmdbuf, &cbbi) != VK_SUCCESS) debug_printf("vkBeginCommandBuffer failed\n"); - if (!ctx->queries_disabled) + if (!ctx->queries_disabled && batch->batch_id != ZINK_COMPUTE_BATCH_ID) zink_resume_queries(ctx, batch); } void zink_end_batch(struct zink_context *ctx, struct zink_batch *batch) { - if (!ctx->queries_disabled) + if (!ctx->queries_disabled && batch->batch_id != ZINK_COMPUTE_BATCH_ID) zink_suspend_queries(ctx, batch); if (vkEndCommandBuffer(batch->cmdbuf) != VK_SUCCESS) {