Module: Mesa
Branch: master
Commit: 5f6cd7bba91e8be99e7736e59fe9df539444daf3
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f6cd7bba91e8be99e7736e59fe9df539444daf3

Author: Mike Blumenkrantz <michael.blumenkra...@gmail.com>
Date:   Mon Aug 17 10:58:08 2020 -0400

zink: be a little more precise about query types in one conditional

just for readability, no functional changes

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

---

 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 f75dcce2b5a..89ec037be9c 100644
--- a/src/gallium/drivers/zink/zink_query.c
+++ b/src/gallium/drivers/zink/zink_query.c
@@ -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);

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to