Vulkan: Make CommandBufferHelper::empty() logic less obtuse

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -2671,7 +2671,7 @@ angle::Result ContextVk::updateScissor(const gl::State &glState)
     // a render pass, the scissor is disabled and a draw call is issued to affect the whole
     // framebuffer.
     gl::Rectangle scissoredRenderArea = framebufferVk->getRotatedScissoredRenderArea(this);
-    if (!mRenderPassCommands->empty())
+    if (mRenderPassCommands->started())
     {
         if (!mRenderPassCommands->getRenderArea().encloses(scissoredRenderArea))
         {
@@ -3934,7 +3934,7 @@ angle::Result ContextVk::updateActiveImages(const gl::Context *context,
 bool ContextVk::hasRecordedCommands()
 {
     ASSERT(mOutsideRenderPassCommands && mRenderPassCommands);
-    return !mOutsideRenderPassCommands->empty() || !mRenderPassCommands->empty() ||
+    return !mOutsideRenderPassCommands->empty() || mRenderPassCommands->started() ||
            mHasPrimaryCommands;
 }
 
@@ -4395,7 +4395,7 @@ angle::Result ContextVk::startRenderPass(gl::Rectangle renderArea,
 
 angle::Result ContextVk::endRenderPass()
 {
-    if (mRenderPassCommands->empty())
+    if (!mRenderPassCommands->started())
     {
         onRenderPassFinished();
         return angle::Result::Continue;

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -528,7 +528,7 @@ class ContextVk : public ContextImpl, public vk::Context
                                           const vk::ClearValuesArray &clearValues,
                                           vk::CommandBuffer **commandBufferOut);
 
-    bool hasStartedRenderPass() const { return !mRenderPassCommands->empty(); }
+    bool hasStartedRenderPass() const { return mRenderPassCommands->started(); }
 
     vk::CommandBufferHelper &getStartedRenderPassCommands()
     {

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -877,12 +877,19 @@ struct CommandBufferHelper : angle::NonCopyable
 
     void executeBarriers(vk::PrimaryCommandBuffer *primary);
 
-    bool empty() const { return (!mCommandBuffer.empty() || mRenderPassStarted) ? false : true; }
     void setHasRenderPass(bool hasRenderPass) { mIsRenderPassCommandBuffer = hasRenderPass; }
     void reset();
     void releaseToContextQueue(ContextVk *contextVk);
 
-    // RenderPass related functions
+    // Returns true if we have no work to execute. For renderpass command buffer, even if the
+    // underlying command buffer is empty, we may still have a renderpass with an empty command
+    // buffer just to do the clear.
+    bool empty() const
+    {
+        return mIsRenderPassCommandBuffer ? !mRenderPassStarted : mCommandBuffer.empty();
+    }
+    // RenderPass related functions. This is equivalent to !empty(), but only when you know this is
+    // a RenderPass command buffer
     bool started() const
     {
         ASSERT(mIsRenderPassCommandBuffer);