Module: Mesa Branch: main Commit: f58594cdea4c2b1b23c7da7fafc9868935529ff1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f58594cdea4c2b1b23c7da7fafc9868935529ff1
Author: Mike Blumenkrantz <[email protected]> Date: Tue May 23 09:30:59 2023 -0400 zink: don't wait on queue thread if disabled Fixes: 270f9c0b063 ("zink: add ZINK_DEBUG=flushsync") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23189> --- src/gallium/drivers/zink/zink_context.c | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 5a2fcae3a2c..c6520c14dcc 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -3032,7 +3032,7 @@ zink_evaluate_depth_buffer(struct pipe_context *pctx) static void sync_flush(struct zink_context *ctx, struct zink_batch_state *bs) { - if (zink_screen(ctx->base.screen)->threaded) + if (zink_screen(ctx->base.screen)->threaded_submit) util_queue_fence_wait(&bs->flush_completed); } diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index ab7a5f2a03d..27b7c253fcd 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1655,7 +1655,7 @@ zink_flush_frontbuffer(struct pipe_screen *pscreen, if (ctx->batch.swapchain || ctx->needs_present) { ctx->batch.has_work = true; pctx->flush(pctx, NULL, PIPE_FLUSH_END_OF_FRAME); - if (ctx->last_fence && screen->threaded) { + if (ctx->last_fence && screen->threaded_submit) { struct zink_batch_state *bs = zink_batch_state(ctx->last_fence); util_queue_fence_wait(&bs->flush_completed); }
