commit d33c77c02aa343707765235b510e70f450ee549f
author Jamie Madill <jmadill@chromium.org> Thu Nov 09 13:08:30 2017 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Nov 15 03:04:29 2017 +0000
tree 63c70fe3fc41903ea5794cba53a5a038f6747804
parent fea1e7541f445d64293a868f103541636f721be4

Vulkan: Use correct transfer access mask in layout change.

When using a transfer destination, we should be using the transfer
access mask, not bottom of pipe or other bits.

Uncovered by using a newer version of the layers SDK.

BUG=angleproject:2237

Change-Id: I3ebcca707ac8889d2ece099e3765f5b0ca3dfdbc
Reviewed-on: https://chromium-review.googlesource.com/760636
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 99530ec..4b457b7 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -285,8 +285,9 @@
     stagingImage.getImage().changeLayoutTop(VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_GENERAL,
                                             commandBuffer);
 
-    readImage->changeLayoutTop(VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-                               commandBuffer);
+    readImage->changeLayoutWithStages(
+        VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+        VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
 
     VkImageCopy region;
     region.srcSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;