From d60c864c454aba9e9d9bbfc98dae6cbae798c0d4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 21 Feb 2023 16:59:26 -0500 Subject: [PATCH] zink: delete zink_query::last_start_idx this was always zero Part-of: --- src/gallium/drivers/zink/zink_query.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index f887b571704..b9bac0d34c2 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -62,7 +62,6 @@ struct zink_query { */ struct util_dynarray starts; - unsigned last_start_idx; VkQueryType vkqtype; unsigned index; bool precise; @@ -806,7 +805,7 @@ reset_qbos(struct zink_context *ctx, struct zink_query *q) static inline unsigned get_buffer_offset(struct zink_query *q) { - return (get_num_starts(q) - q->last_start_idx - 1) * get_num_results(q) * sizeof(uint64_t); + return (get_num_starts(q) - 1) * get_num_results(q) * sizeof(uint64_t); } static void @@ -919,8 +918,6 @@ zink_begin_query(struct pipe_context *pctx, util_dynarray_clear(&query->starts); - query->last_start_idx = get_num_starts(query); - /* A query must either begin and end inside the same subpass of a render pass instance, or must both begin and end outside of a render pass instance (i.e. contain entire render pass instances). @@ -1267,7 +1264,7 @@ zink_get_query_result_resource(struct pipe_context *pctx, struct zink_resource *res = zink_resource(pres); unsigned result_size = result_type <= PIPE_QUERY_TYPE_U32 ? sizeof(uint32_t) : sizeof(uint64_t); VkQueryResultFlagBits size_flags = result_type <= PIPE_QUERY_TYPE_U32 ? 0 : VK_QUERY_RESULT_64_BIT; - unsigned num_queries = (get_num_starts(query) - query->last_start_idx); + unsigned num_queries = get_num_starts(query); struct zink_query_start *start = util_dynarray_top_ptr(&query->starts, struct zink_query_start); unsigned query_id = start->vkq[0]->query_id;