commit e821ed6781870336071b32873bb2a1ec0e0cf8b5
author Yunchao He <yunchao.he@intel.com> Thu Mar 28 12:07:41 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Mar 28 12:07:41 2019 +0000
tree 45dd8c8a5f0494b8a091100b5a13021eb4134bb0
parent 494552b886620ef7cc27e9c201a2c9a5a3db74bf

Vulkan: Fix layout of destination image of T2T copies

Bug=dawn:18

Change-Id: Ie218b70376b6630449764ac789c9f47c7d5fae2b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/6080
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>

src/dawn_native/vulkan/CommandBufferVk.cpp

diff --git a/src/dawn_native/vulkan/CommandBufferVk.cpp b/src/dawn_native/vulkan/CommandBufferVk.cpp
index fa9b36c..283637e 100644
--- a/src/dawn_native/vulkan/CommandBufferVk.cpp
+++ b/src/dawn_native/vulkan/CommandBufferVk.cpp
@@ -348,8 +348,10 @@
 
                     VkImageCopy region = ComputeImageCopyRegion(src, dst, copy->copySize);
 
+                    // The dstImage is written to so the Dawn guarantees make sure it is in the
+                    // TRANSFER_DST_OPTIMAL layout
                     device->fn.CmdCopyImage(commands, srcImage, VK_IMAGE_LAYOUT_GENERAL, dstImage,
-                                            VK_IMAGE_LAYOUT_GENERAL, 1, &region);
+                                            VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
                 } break;
 
                 case Command::BeginRenderPass: {