Module: Mesa Branch: staging/23.0 Commit: f8d901be62000b3bc3694bad5118d50b18384133 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f8d901be62000b3bc3694bad5118d50b18384133
Author: Mike Blumenkrantz <[email protected]> Date: Thu Feb 23 08:20:08 2023 -0500 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 96f7fe71913707886cd779e9b35f6067a32b55e5) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a653278c722..e2a833f969a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 }, diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index 36aaad362e8..d68c5348140 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -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); } }
