From 257a808357939da62792b7a603715271e93eae4d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 20 Aug 2020 10:26:57 -0400 Subject: [PATCH] zink: always use query->type for starting/stopping xfb queries we're going to be seeing some overlap here Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index a682eabb5c1..5b5f8e62506 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -386,7 +386,7 @@ end_query(struct zink_context *ctx, struct zink_batch *batch, struct zink_query vkCmdWriteTimestamp(batch->cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, q->query_pool, q->curr_query); q->batch_id = batch->batch_id; - } else if (q->vkqtype == VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT || q->type == PIPE_QUERY_PRIMITIVES_GENERATED) + } else if (q->type == PIPE_QUERY_PRIMITIVES_EMITTED || q->type == PIPE_QUERY_PRIMITIVES_GENERATED) screen->vk_CmdEndQueryIndexedEXT(batch->cmdbuf, q->xfb_query_pool ? q->xfb_query_pool : q->query_pool, q->curr_query, q->index); if (q->vkqtype != VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT && !is_time_query(q)) vkCmdEndQuery(batch->cmdbuf, q->query_pool, q->curr_query);