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

zink: add some pre-checks before calling query update/suspend/resume

Browse Source 
these trigger lots of context switches which impact perf

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37318>
This commit is contained in:
Mike Blumenkrantz
2025-08-15 08:49:35 -04:00
committed by Marge Bot
parent 9d19d7f6de
commit 69f90bfe29
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_context.c
+6 -4
View File
@@ -3353,9 +3353,10 @@ zink_batch_rp(struct zink_context *ctx)
bool maybe_has_query_ends = !ctx->track_renderpasses || ctx->dynamic_fb.tc_info.has_query_ends;
ctx->queries_in_rp = maybe_has_query_ends;
/* if possible, out-of-renderpass resume any queries that were stopped when previous rp ended */
if (!ctx->queries_disabled && !maybe_has_query_ends) {
if (!ctx->queries_disabled && !maybe_has_query_ends && !list_is_empty(&ctx->suspended_queries)) {
zink_resume_queries(ctx);
zink_query_update_gs_states(ctx);
if (ctx->vertices_query || !list_is_empty(&ctx->primitives_generated_queries))
zink_query_update_gs_states(ctx);
}
unsigned clear_buffers = begin_rendering(ctx, true);
assert(!ctx->rp_changed);
@@ -3374,9 +3375,10 @@ zink_batch_rp(struct zink_context *ctx)
zink_clear_framebuffer(ctx, clear_buffers);
}
/* unable to previously determine that queries didn't split renderpasses: ensure queries start inside renderpass */
if (!ctx->queries_disabled && maybe_has_query_ends) {
if (!ctx->queries_disabled && maybe_has_query_ends && !list_is_empty(&ctx->suspended_queries)) {
zink_resume_queries(ctx);
zink_query_update_gs_states(ctx);
if (ctx->vertices_query || !list_is_empty(&ctx->primitives_generated_queries))
zink_query_update_gs_states(ctx);
}
}
src/gallium/drivers/zink/zink_draw.cpp
+2 -1
View File
@@ -438,7 +438,8 @@ zink_draw(struct pipe_context *pctx,
res->obj->unordered_read = false;
}
zink_query_update_gs_states(ctx);
if (ctx->vertices_query || !list_is_empty(&ctx->primitives_generated_queries))
zink_query_update_gs_states(ctx);
if (unlikely(zink_debug & ZINK_DEBUG_SYNC)) {
zink_batch_no_rp(ctx);