zink: remove suspended queries from list before resuming

this avoids double-starting primgen queries from recursion when
needs_rast_discard_workaround is true

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21534>
(cherry picked from commit 96f7fe7191)
This commit is contained in:
Mike Blumenkrantz 2023-02-23 08:20:08 -05:00 committed by Dylan Baker
parent a5af95b4a1
commit f8d901be62
2 changed files with 2 additions and 2 deletions

View file

@ -814,7 +814,7 @@
"description": "zink: remove suspended queries from list before resuming",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -1070,8 +1070,8 @@ zink_resume_queries(struct zink_context *ctx, struct zink_batch *batch)
{
struct zink_query *query, *next;
LIST_FOR_EACH_ENTRY_SAFE(query, next, &ctx->suspended_queries, active_list) {
begin_query(ctx, batch, query);
list_delinit(&query->active_list);
begin_query(ctx, batch, query);
}
}