Vulkan: Rename mStagingBufferStorage to mStagingBuffer

src/libANGLE/renderer/vulkan/BufferVk.cpp

@@ -497,7 +497,7 @@ angle::Result BufferVk::stagedUpdate(ContextVk *contextVk,
     uint8_t *mapPointer              = nullptr;
     VkDeviceSize stagingBufferOffset = 0;
 
-    vk::DynamicBuffer *stagingBuffer = contextVk->getStagingBufferStorage();
+    vk::DynamicBuffer *stagingBuffer = contextVk->getStagingBuffer();
     ANGLE_TRY(stagingBuffer->allocate(contextVk, size, &mapPointer, nullptr, &stagingBufferOffset,
                                       nullptr));
     ASSERT(mapPointer);

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -793,7 +793,7 @@ void ContextVk::onDestroy(const gl::Context *context)
 
     mDefaultUniformStorage.release(mRenderer);
     mEmptyBuffer.release(mRenderer);
-    mStagingBufferStorage.release(mRenderer);
+    mStagingBuffer.release(mRenderer);
 
     for (vk::DynamicBuffer &defaultBuffer : mDefaultAttribBuffers)
     {
@@ -950,8 +950,8 @@ angle::Result ContextVk::initialize()
     size_t stagingBufferAlignment =
         static_cast<size_t>(mRenderer->getPhysicalDeviceProperties().limits.minMemoryMapAlignment);
     constexpr size_t kStagingBufferSize = 1024u * 1024u;  // 1M
-    mStagingBufferStorage.init(mRenderer, kStagingBufferUsageFlags, stagingBufferAlignment,
-                               kStagingBufferSize, true);
+    mStagingBuffer.init(mRenderer, kStagingBufferUsageFlags, stagingBufferAlignment,
+                        kStagingBufferSize, true);
 
     return angle::Result::Continue;
 }
@@ -4079,7 +4079,7 @@ angle::Result ContextVk::flushImpl(const vk::Semaphore *signalSemaphore)
         driverUniform.dynamicBuffer.releaseInFlightBuffersToResourceUseList(this);
     }
     mDefaultUniformStorage.releaseInFlightBuffersToResourceUseList(this);
-    mStagingBufferStorage.releaseInFlightBuffersToResourceUseList(this);
+    mStagingBuffer.releaseInFlightBuffersToResourceUseList(this);
 
     if (mRenderer->getFeatures().enableCommandProcessingThread.enabled)
     {

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -628,7 +628,7 @@ class ContextVk : public ContextImpl, public vk::Context
     void setDefaultUniformBlocksMinSizeForTesting(size_t minSize);
 
     vk::BufferHelper &getEmptyBuffer() { return mEmptyBuffer; }
-    vk::DynamicBuffer *getStagingBufferStorage() { return &mStagingBufferStorage; }
+    vk::DynamicBuffer *getStagingBuffer() { return &mStagingBuffer; }
 
     const vk::PerfCounters &getPerfCounters() const { return mPerfCounters; }
     vk::PerfCounters &getPerfCounters() { return mPerfCounters; }
@@ -1117,7 +1117,7 @@ class ContextVk : public ContextImpl, public vk::Context
     vk::DynamicBuffer mDefaultUniformStorage;
 
     // All staging buffer support is provided by a DynamicBuffer.
-    vk::DynamicBuffer mStagingBufferStorage;
+    vk::DynamicBuffer mStagingBuffer;
 
     std::vector<std::string> mCommandBufferDiagnostics;
 };

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -374,7 +374,7 @@ angle::Result TextureVk::setSubImageImpl(const gl::Context *context,
     vk::DynamicBuffer *stagingBuffer = nullptr;
     if (!mOwnsImage || mState.getImmutableFormat())
     {
-        stagingBuffer = contextVk->getStagingBufferStorage();
+        stagingBuffer = contextVk->getStagingBuffer();
     }
 
     if (unpackBuffer)