zink: be a little more precise about query types in one conditional
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Mon, 17 Aug 2020 14:58:08 +0000 (10:58 -0400)
committerMarge Bot <eric+marge@anholt.net>
Fri, 5 Feb 2021 13:31:16 +0000 (13:31 +0000)
just for readability, no functional changes

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8516>

src/gallium/drivers/zink/zink_query.c

index f75dcce2b5a095ccfb32ec3e631eeae7cdad3a6b..89ec037be9c5262902cefcdc6543e202a8103387 100644 (file)
@@ -384,7 +384,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->type == PIPE_QUERY_PRIMITIVES_EMITTED || q->type == PIPE_QUERY_PRIMITIVES_GENERATED)
+   } else if (q->vkqtype == VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT || 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);