From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Fri, 1 Nov 2019 09:36:30 +0000 (+0100)
Subject: zink: transition resources before resolving
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1277192d55cbcc4342027da0e77fa5b1e7637992;p=mesa.git

zink: transition resources before resolving
---

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 133c75382da..1fd6a3da5a7 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1273,6 +1273,14 @@ blit_resolve(struct zink_context *ctx, const struct pipe_blit_info *info)
    zink_batch_reference_resoure(batch, src);
    zink_batch_reference_resoure(batch, dst);
 
+   if (src->layout != VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL)
+      zink_resource_barrier(batch->cmdbuf, src, src->aspect,
+                            VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
+
+   if (dst->layout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
+      zink_resource_barrier(batch->cmdbuf, dst, dst->aspect,
+                            VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+
    VkImageResolve region = {};
 
    region.srcSubresource.aspectMask = src->aspect;