Mesa (master): zink: transition resources before resolving

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 1277192d55cbcc4342027da0e77fa5b1e7637992
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1277192d55cbcc4342027da0e77fa5b1e7637992

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Fri Nov  1 10:36:30 2019 +0100

zink: transition resources before resolving

---

 src/gallium/drivers/zink/zink_context.c | 8 ++++++++
 1 file changed, 8 insertions(+)

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;