Vulkan: Use context staging buffer for copyImageDataToBuffer

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -946,7 +946,8 @@ angle::Result ContextVk::initialize()
     constexpr VkMemoryPropertyFlags kMemoryType = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
     ANGLE_TRY(mEmptyBuffer.init(this, emptyBufferInfo, kMemoryType));
 
-    constexpr VkImageUsageFlags kStagingBufferUsageFlags = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+    constexpr VkImageUsageFlags kStagingBufferUsageFlags =
+        VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
     size_t stagingBufferAlignment =
         static_cast<size_t>(mRenderer->getPhysicalDeviceProperties().limits.minMemoryMapAlignment);
     constexpr size_t kStagingBufferSize = 1024u * 1024u;  // 1M

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -4400,20 +4400,6 @@ void ImageHelper::stageSelfForBaseLevel()
                                     getLevelExtents(0), mImageType);
 }
 
-angle::Result ImageHelper::allocateStagingMemory(ContextVk *contextVk,
-                                                 size_t sizeInBytes,
-                                                 uint8_t **ptrOut,
-                                                 BufferHelper **bufferOut,
-                                                 StagingBufferOffsetArray *offsetOut,
-                                                 bool *newBufferAllocatedOut)
-{
-    VkBuffer handle;
-    ANGLE_TRY(mStagingBuffer.allocate(contextVk, sizeInBytes, ptrOut, &handle, &(*offsetOut)[0],
-                                      newBufferAllocatedOut));
-    *bufferOut = mStagingBuffer.getCurrentBuffer();
-    return angle::Result::Continue;
-}
-
 angle::Result ImageHelper::flushSingleSubresourceStagedUpdates(ContextVk *contextVk,
                                                                uint32_t levelGL,
                                                                uint32_t layer,
@@ -4806,9 +4792,11 @@ angle::Result ImageHelper::copyImageDataToBuffer(ContextVk *contextVk,
 
     const VkImageAspectFlags aspectFlags = getAspectFlags();
 
-    // Allocate staging buffer data
-    ANGLE_TRY(allocateStagingMemory(contextVk, *bufferSize, outDataPtr, bufferOut, bufferOffsetsOut,
-                                    nullptr));
+    // Allocate staging buffer data from context
+    VkBuffer bufferHandle;
+    ANGLE_TRY(contextVk->getStagingBuffer()->allocate(
+        contextVk, *bufferSize, outDataPtr, &bufferHandle, &(*bufferOffsetsOut)[0], nullptr));
+    *bufferOut = contextVk->getStagingBuffer()->getCurrentBuffer();
 
     uint32_t sourceLevelVk = static_cast<uint32_t>(sourceLevelGL) - mBaseLevel;
 
@@ -4865,8 +4853,7 @@ angle::Result ImageHelper::copyImageDataToBuffer(ContextVk *contextVk,
 
     CommandBuffer &commandBuffer = contextVk->getOutsideRenderPassCommandBuffer();
 
-    commandBuffer.copyImageToBuffer(mImage, getCurrentLayout(),
-                                    (*bufferOut)->getBuffer().getHandle(), 1, regions);
+    commandBuffer.copyImageToBuffer(mImage, getCurrentLayout(), bufferHandle, 1, regions);
 
     return angle::Result::Continue;
 }

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1397,15 +1397,6 @@ class ImageHelper final : public Resource, public angle::Subject
     // is used for mipmap generation.
     void stageSelfForBaseLevel();
 
-    // This will use the underlying dynamic buffer to allocate some memory to be used as a src or
-    // dst.
-    angle::Result allocateStagingMemory(ContextVk *contextVk,
-                                        size_t sizeInBytes,
-                                        uint8_t **ptrOut,
-                                        BufferHelper **bufferOut,
-                                        StagingBufferOffsetArray *offsetOut,
-                                        bool *newBufferAllocatedOut);
-
     // Flush staged updates for a single subresource. Can optionally take a parameter to defer
     // clears to a subsequent RenderPass load op.
     angle::Result flushSingleSubresourceStagedUpdates(ContextVk *contextVk,