1 files changed, 5 insertions, 7 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.cpp b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.cpp
index dd62995c4a0..acf7f55e955 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.cpp
+++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.cpp
@@ -121,11 +121,9 @@ angle::Result OverlayVk::createFont(ContextVk *contextVk)
                                        &mFontImageView, 0, 1));
 
     // Copy font data from staging buffer.
-    vk::CommandBuffer *fontDataUpload;
     ANGLE_TRY(contextVk->onBufferTransferRead(&fontDataBuffer.get()));
-    ANGLE_TRY(contextVk->onImageWrite(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferDst,
-                                      &mFontImage));
-    ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&fontDataUpload));
+    ANGLE_TRY(contextVk->onImageTransferWrite(VK_IMAGE_ASPECT_COLOR_BIT, &mFontImage));
+    vk::CommandBuffer &fontDataUpload = contextVk->getOutsideRenderPassCommandBuffer();
 
     VkBufferImageCopy copy           = {};
     copy.bufferRowLength             = gl::overlay::kFontImageWidth;
@@ -136,9 +134,9 @@ angle::Result OverlayVk::createFont(ContextVk *contextVk)
     copy.imageExtent.height          = gl::overlay::kFontImageHeight;
     copy.imageExtent.depth           = 1;
 
-    fontDataUpload->copyBufferToImage(fontDataBuffer.get().getBuffer().getHandle(),
-                                      mFontImage.getImage(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-                                      1, &copy);
+    fontDataUpload.copyBufferToImage(fontDataBuffer.get().getBuffer().getHandle(),
+                                     mFontImage.getImage(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1,
+                                     &copy);
 
     return angle::Result::Continue;
 }