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/760636Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Frank Henigman <fjhenigman@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Vulkan: Use correct transfer access mask in layout change.
d33c77c0 · Jamie Madill · Commit Bot · fea1e754 · d33c77c0 · d33c77c0
Commit d33c77c0 authored Nov 09, 2017 by Jamie Madill Committed by Commit Bot Nov 15, 2017
Showing with 12 additions and 8 deletions

FramebufferVk.cpp src/libANGLE/renderer/vulkan/FramebufferVk.cpp +3 -2

SurfaceVk.cpp src/libANGLE/renderer/vulkan/SurfaceVk.cpp +3 -2

TextureVk.cpp src/libANGLE/renderer/vulkan/TextureVk.cpp +6 -4

No files found.
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -285,8 +285,9 @@ gl::Error FramebufferVk::readPixels(const gl::Context *context,
    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;

--- a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
@@ -396,8 +396,9 @@ vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
        ANGLE_TRY(member.imageView.init(device, imageViewInfo));

        // Set transfer dest layout, and clear the image to black.
-        member.image.changeLayoutTop(VK_IMAGE_ASPECT_COLOR_BIT,
-                                     VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, commandBuffer);
+        member.image.changeLayoutWithStages(
+            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+            VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
        commandBuffer->clearSingleColorImage(member.image, transparentBlack);

        ANGLE_TRY(member.imageAcquiredSemaphore.init(device));

--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -235,10 +235,12 @@ gl::Error TextureVk::setImage(const gl::Context *context,
        // TODO(jmadill): Command reordering.
        renderer->endRenderPass();

-        stagingImage.getImage().changeLayoutTop(
-            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, commandBuffer);
-        mImage.changeLayoutTop(VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-                               commandBuffer);
+        stagingImage.getImage().changeLayoutWithStages(
+            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
+        mImage.changeLayoutWithStages(
+            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);

        gl::Box wholeRegion(0, 0, 0, size.width, size.height, size.depth);
        commandBuffer->copySingleImage(stagingImage.getImage(), mImage, wholeRegion,