Vulkan: Fix overlay with command graph disabled.

Also fixes the missing RenderPass count in the new command recorder.

Bug: angleproject:4029
Change-Id: If7f0cf9e80ef815781ad2684ad1d93a3ed4912ad
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2037786
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Tobin Ehlis <tobine@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

Author: null77

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -3953,6 +3953,7 @@ void RenderPassCommandBuffer::beginRenderPass(const vk::Framebuffer &framebuffer
     *commandBufferOut = &mCommandBuffer;
 
     mRenderPassStarted = true;
+    mCounter++;
 }
 
 angle::Result RenderPassCommandBuffer::flushToPrimary(ContextVk *contextVk,

src/libANGLE/renderer/vulkan/OverlayVk.cpp

@@ -121,12 +121,21 @@ angle::Result OverlayVk::createFont(ContextVk *contextVk)
 
     // Copy font data from staging buffer.
     vk::CommandBuffer *fontDataUpload;
-    ANGLE_TRY(mFontImage.recordCommands(contextVk, &fontDataUpload));
-
-    fontDataBuffer.get().onRead(contextVk, &mFontImage, VK_ACCESS_TRANSFER_READ_BIT);
+    if (contextVk->commandGraphEnabled())
+    {
+        ANGLE_TRY(mFontImage.recordCommands(contextVk, &fontDataUpload));
 
-    mFontImage.changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferDst,
-                            fontDataUpload);
+        fontDataBuffer.get().onRead(contextVk, &mFontImage, VK_ACCESS_TRANSFER_READ_BIT);
+        mFontImage.changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferDst,
+                                fontDataUpload);
+    }
+    else
+    {
+        ANGLE_TRY(contextVk->onBufferRead(VK_ACCESS_TRANSFER_READ_BIT, &fontDataBuffer.get()));
+        ANGLE_TRY(contextVk->onImageWrite(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferDst,
+                                          &mFontImage));
+        ANGLE_TRY(contextVk->getOutsideRenderPassCommandBuffer(&fontDataUpload));
+    }
 
     VkBufferImageCopy copy           = {};
     copy.bufferRowLength             = gl::overlay::kFontImageWidth;
@@ -141,8 +150,11 @@ angle::Result OverlayVk::createFont(ContextVk *contextVk)
                                       mFontImage.getImage(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
                                       1, &copy);
 
-    mFontImage.changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::ComputeShaderReadOnly,
-                            fontDataUpload);
+    if (contextVk->commandGraphEnabled())
+    {
+        mFontImage.changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::ComputeShaderReadOnly,
+                                fontDataUpload);
+    }
 
     return angle::Result::Continue;
 }