Vulkan: Remove unnecessary barrier in image -> buffer copy

There was already a changeLayout call that inserted an imageBarrier. A TRANSFER_SRC to TRANSFER_SRC barrier was unnecessarily (and manually) added afterwards that was pointless. Bug: angleproject:3816 Change-Id: I8177487fc843fa5869c7b5063c74602933a81d58 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1929270Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Sunny Sun <sunny.sun@arm.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: Remove unnecessary barrier in image -> buffer copy
5b2740c5 · Shahbaz Youssefi · Commit Bot · fe2d3ddd · 5b2740c5
Commit 5b2740c5 authored Nov 22, 2019 by Shahbaz Youssefi Committed by Commit Bot Nov 26, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 23 deletions

vk_helpers.cpp src/libANGLE/renderer/vulkan/vk_helpers.cpp +0 -23

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -2974,24 +2974,6 @@ angle::Result ImageHelper::copyImageDataToBuffer(ContextVk *contextVk,
    const VkImageAspectFlags aspectFlags = getAspectFlags();
    changeLayout(aspectFlags, ImageLayout::TransferSrc, commandBuffer);

-    VkImageMemoryBarrier barrier            = {};
-    barrier.sType                           = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-    barrier.image                           = mImage.getHandle();
-    barrier.srcQueueFamilyIndex             = VK_QUEUE_FAMILY_IGNORED;
-    barrier.dstQueueFamilyIndex             = VK_QUEUE_FAMILY_IGNORED;
-    barrier.subresourceRange.aspectMask     = aspectFlags;
-    barrier.subresourceRange.baseArrayLayer = baseLayer;
-    barrier.subresourceRange.layerCount     = layerCount;
-    barrier.subresourceRange.levelCount     = 1;
-    barrier.subresourceRange.baseMipLevel   = static_cast<uint32_t>(sourceLevel);
-    barrier.oldLayout                       = getCurrentLayout();
-    barrier.newLayout                       = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    barrier.srcAccessMask                   = VK_ACCESS_TRANSFER_WRITE_BIT;
-    barrier.dstAccessMask                   = VK_ACCESS_TRANSFER_READ_BIT;
-
-    commandBuffer->imageBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-                                &barrier);
-
    // Allocate staging buffer data
    ANGLE_TRY(allocateStagingMemory(contextVk, *bufferSize, outDataPtr, bufferOut, bufferOffsetsOut,
                                    nullptr));
@@ -3049,11 +3031,6 @@ angle::Result ImageHelper::copyImageDataToBuffer(ContextVk *contextVk,
    commandBuffer->copyImageToBuffer(mImage, getCurrentLayout(),
                                     (*bufferOut)->getBuffer().getHandle(), 1, regions);

-    barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    commandBuffer->imageBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-                                &barrier);
-
    return angle::Result::Continue;
 }