zink: disable unordered blits when swapchain images need aqcuire

this is consistent with other cmdbuf reordering for blits

Fixes: 3a9f7d7038 ("zink: implement unordered u_blitter calls")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23035>
(cherry picked from commit ab3914a17b)
This commit is contained in:
Mike Blumenkrantz 2023-05-15 07:24:02 -04:00 committed by Eric Engestrom
parent f38120d63f
commit 66ed3b4f0c
2 changed files with 2 additions and 1 deletions

View file

@ -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"
},

View file

@ -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;