From 66ed3b4f0c495d1110cb1bf1632b9e43108fb9b7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 15 May 2023 07:24:02 -0400 Subject: [PATCH] zink: disable unordered blits when swapchain images need aqcuire this is consistent with other cmdbuf reordering for blits Fixes: 3a9f7d70383 ("zink: implement unordered u_blitter calls") Part-of: (cherry picked from commit ab3914a17b8630b93badcb4f8b948c3bf2e898ee) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_blit.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f279b347929..3f61408b9af 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -436,7 +436,7 @@ "description": "zink: disable unordered blits when swapchain images need aqcuire", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3a9f7d70383bb5562be718d2071a8b0c84fba3aa" }, diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index 019a6eda785..3f87dff680d 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -388,6 +388,7 @@ zink_blit(struct pipe_context *pctx, ctx->unordered_blitting = !(info->render_condition_enable && ctx->render_condition_active) && zink_screen(ctx->base.screen)->info.have_KHR_dynamic_rendering && + !needs_present_readback && zink_get_cmdbuf(ctx, src, dst) == ctx->batch.state->barrier_cmdbuf; VkCommandBuffer cmdbuf = ctx->batch.state->cmdbuf; VkPipeline pipeline = ctx->gfx_pipeline_state.pipeline;