Vulkan: Rename onImageHelperRelease to finalizeImageLayout

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -497,11 +497,11 @@ class ContextVk : public ContextImpl, public vk::Context, public MultisampleText
                                                     layerCount, image, resolveImage);
     }
 
-    void onImageHelperRelease(const vk::ImageHelper *image)
+    void finalizeImageLayout(const vk::ImageHelper *image)
     {
         if (mRenderPassCommands->started())
         {
-            mRenderPassCommands->onImageHelperRelease(this, image);
+            mRenderPassCommands->finalizeImageLayout(this, image);
         }
     }
 

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -1329,7 +1329,7 @@ angle::Result WindowSurfaceVk::present(ContextVk *contextVk,
     // Because the color attachment defers layout changes until endRenderPass time, we must call
     // finalize the layout transition in the renderpass before we insert layout change to
     // ImageLayout::Present bellow.
-    contextVk->onImageHelperRelease(&image.image);
+    contextVk->finalizeImageLayout(&image.image);
 
     vk::CommandBuffer *commandBuffer;
     ANGLE_TRY(contextVk->getOutsideRenderPassCommandBuffer({}, &commandBuffer));

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -1358,7 +1358,7 @@ void CommandBufferHelper::finalizeDepthStencilResolveImageLayout(Context *contex
     }
 }
 
-void CommandBufferHelper::onImageHelperRelease(Context *context, const ImageHelper *image)
+void CommandBufferHelper::finalizeImageLayout(Context *context, const ImageHelper *image)
 {
     ASSERT(mIsRenderPassCommandBuffer);
 
@@ -3909,7 +3909,7 @@ void ImageHelper::releaseImageFromShareContexts(RendererVk *renderer, ContextVk
         ShareContextSet &shareContextSet = *contextVk->getShareGroupVk()->getShareContextSet();
         for (ContextVk *ctx : shareContextSet)
         {
-            ctx->onImageHelperRelease(this);
+            ctx->finalizeImageLayout(this);
         }
     }
 
@@ -5754,7 +5754,7 @@ void ImageHelper::stageSelfForBaseLevel(ContextVk *contextVk)
     // Because we are cloning this object to another object, we must finalize the layout if it is
     // being used by current renderpass as attachment. Otherwise we are copying the incorrect layout
     // since it is determined at endRenderPass time.
-    contextVk->onImageHelperRelease(this);
+    contextVk->finalizeImageLayout(this);
 
     std::unique_ptr<ImageHelper> prevImage = std::make_unique<ImageHelper>();
     // Move the necessary information for staged update to work, and keep the rest as part of this

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1086,7 +1086,8 @@ class CommandBufferHelper : angle::NonCopyable
         return mRenderPassStarted;
     }
 
-    void onImageHelperRelease(Context *context, const ImageHelper *image);
+    // Finalize the layout if image has any deferred layout transition.
+    void finalizeImageLayout(Context *context, const ImageHelper *image);
 
     void beginRenderPass(const Framebuffer &framebuffer,
                          const gl::Rectangle &renderArea,