AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: delete zink_query::last_start_idx

Browse Source 
this was always zero

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21534>
This commit is contained in:
Mike Blumenkrantz
2023-02-21 16:59:26 -05:00
committed by Marge Bot
parent c46d68235e
commit d60c864c45
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_query.c
+2 -5
View File
@@ -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;