Vulkan: Optimize ContextVk::setupDraw.

src/libANGLE/Program.h

@@ -354,6 +354,8 @@ class ProgramState final : angle::NonCopyable
 
     bool hasAttachedShader() const;
 
+    const ActiveTextureMask &getActiveSamplersMask() const { return mActiveSamplersMask; }
+
   private:
     friend class MemoryProgramCache;
     friend class Program;

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -257,21 +257,16 @@ angle::Result ContextVk::setupDraw(const gl::Context *context,
                                    const DirtyBits &dirtyBitsMask,
                                    vk::CommandBuffer **commandBufferOut)
 {
+    // Set any dirty bits that depend on draw call parameters or other objects.
     if (drawCallParams.mode() != mCurrentDrawMode)
     {
         invalidateCurrentPipeline();
         mCurrentDrawMode = drawCallParams.mode();
     }
 
-    const gl::State &state       = mState.getState();
-    const gl::Program *programGL = state.getProgram();
-
-    vk::RecordingMode mode;
-    ANGLE_TRY(mDrawFramebuffer->getCommandBufferForDraw(this, commandBufferOut, &mode));
-
-    // Set any dirty bits that depend on draw call parameters or other objects.
-    if (mode == vk::RecordingMode::Start)
+    if (!mDrawFramebuffer->appendToStartedRenderPass(mRenderer, commandBufferOut))
     {
+        ANGLE_TRY(mDrawFramebuffer->startNewRenderPass(this, commandBufferOut));
         mDirtyBits |= mNewCommandBufferDirtyBits;
     }
 
@@ -317,7 +312,7 @@ angle::Result ContextVk::setupDraw(const gl::Context *context,
 
                 // TODO(jmadill): Should probably merge this for loop with programVk's descriptor
                 // update.
-                for (size_t textureIndex : programGL->getActiveSamplersMask())
+                for (size_t textureIndex : mProgram->getState().getActiveSamplersMask())
                 {
                     // Ensure any writes to the textures are flushed before we read from them.
                     TextureVk *textureVk = mActiveTextures[textureIndex];
@@ -348,7 +343,7 @@ angle::Result ContextVk::setupDraw(const gl::Context *context,
             case DIRTY_BIT_VERTEX_BUFFERS:
             {
                 BindNonNullVertexBufferRanges(*commandBufferOut,
-                                              programGL->getActiveAttribLocationsMask(),
+                                              mProgram->getState().getActiveAttribLocationsMask(),
                                               mProgram->getState().getMaxActiveAttribLocation(),
                                               mVertexArray->getCurrentArrayBufferHandles(),
                                               mVertexArray->getCurrentArrayBufferOffsets());

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -1087,6 +1087,12 @@ angle::Result FramebufferVk::getCommandBufferForDraw(ContextVk *contextVk,
         return angle::Result::Continue();
     }
 
+    return startNewRenderPass(contextVk, commandBufferOut);
+}
+
+angle::Result FramebufferVk::startNewRenderPass(ContextVk *contextVk,
+                                                vk::CommandBuffer **commandBufferOut)
+{
     vk::Framebuffer *framebuffer = nullptr;
     ANGLE_TRY(getFramebuffer(contextVk, &framebuffer));
 
@@ -1120,7 +1126,6 @@ angle::Result FramebufferVk::getCommandBufferForDraw(ContextVk *contextVk,
     gl::Rectangle renderArea =
         gl::Rectangle(0, 0, mState.getDimensions().width, mState.getDimensions().height);
 
-    *modeOut = vk::RecordingMode::Start;
     return beginRenderPass(contextVk, *framebuffer, renderArea, mRenderPassDesc.value(),
                            attachmentClearValues, commandBufferOut);
 }

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -90,9 +90,6 @@ class FramebufferVk : public FramebufferImpl, public vk::CommandGraphResource
                                 GLfloat *xy) const override;
     RenderTargetVk *getDepthStencilRenderTarget() const;
     const vk::RenderPassDesc &getRenderPassDesc();
-    angle::Result getCommandBufferForDraw(ContextVk *contextVk,
-                                          vk::CommandBuffer **commandBufferOut,
-                                          vk::RecordingMode *modeOut);
 
     // Internal helper function for readPixels operations.
     angle::Result readPixelsImpl(ContextVk *contextVk,
@@ -107,11 +104,21 @@ class FramebufferVk : public FramebufferImpl, public vk::CommandGraphResource
     gl::DrawBufferMask getEmulatedAlphaAttachmentMask();
     RenderTargetVk *getColorReadRenderTarget() const;
 
+    // This will clear the current write operation if it is complete.
+    using CommandGraphResource::appendToStartedRenderPass;
+
+    angle::Result startNewRenderPass(ContextVk *context, vk::CommandBuffer **commandBufferOut);
+
   private:
     FramebufferVk(RendererVk *renderer,
                   const gl::FramebufferState &state,
                   WindowSurfaceVk *backbuffer);
 
+    // Helper for appendToStarted/else startNewRenderPass.
+    angle::Result getCommandBufferForDraw(ContextVk *contextVk,
+                                          vk::CommandBuffer **commandBufferOut,
+                                          vk::RecordingMode *modeOut);
+
     // The 'in' rectangles must be clipped to the scissor and FBO. The clipping is done in 'blit'.
     void blitWithCommand(vk::CommandBuffer *commandBuffer,
                          const gl::Rectangle &readRectIn,