Module: Mesa Branch: main Commit: dcdb000a7ce61629fb01cae95603ce6b18a235c6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcdb000a7ce61629fb01cae95603ce6b18a235c6
Author: Mike Blumenkrantz <[email protected]> Date: Mon Sep 13 10:02:11 2021 -0400 zink: clean up texture_barrier hook a little this looked dumb Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12932> --- src/gallium/drivers/zink/zink_context.c | 41 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 1d98bcbed86..ef8aaf341a9 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -2755,11 +2755,6 @@ zink_texture_barrier(struct pipe_context *pctx, unsigned flags) if (!ctx->framebuffer || !ctx->framebuffer->state.num_attachments) return; - VkMemoryBarrier bmb; - bmb.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER; - bmb.pNext = NULL; - bmb.srcAccessMask = 0; - bmb.dstAccessMask = 0; zink_batch_no_rp(ctx); if (ctx->fb_state.zsbuf) { VkMemoryBarrier dmb; @@ -2776,24 +2771,26 @@ zink_texture_barrier(struct pipe_context *pctx, unsigned flags) 0, NULL, 0, NULL ); - } else { - bmb.srcAccessMask |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - bmb.dstAccessMask |= VK_ACCESS_SHADER_READ_BIT; - } - if (ctx->fb_state.nr_cbufs > 0) { - bmb.srcAccessMask |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - bmb.dstAccessMask |= VK_ACCESS_SHADER_READ_BIT; } - if (bmb.srcAccessMask) - VKCTX(CmdPipelineBarrier)( - ctx->batch.state->cmdbuf, - VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, - VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, - 0, - 1, &bmb, - 0, NULL, - 0, NULL - ); + if (!ctx->fb_state.nr_cbufs) + return; + + VkMemoryBarrier bmb; + bmb.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER; + bmb.pNext = NULL; + bmb.srcAccessMask = 0; + bmb.dstAccessMask = 0; + bmb.srcAccessMask |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + bmb.dstAccessMask |= VK_ACCESS_SHADER_READ_BIT; + VKCTX(CmdPipelineBarrier)( + ctx->batch.state->cmdbuf, + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, + VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, + 0, + 1, &bmb, + 0, NULL, + 0, NULL + ); } static inline void
