Vulkan: Avoid clearWithClearAttachment if RP command buffer is empty

If renderpass has started but no command has been issued, we should chose to use loadOp to do clear instead of clearWithClearAttachment. Bug: b/162521656 Change-Id: Ia681fc96442c7916b4b92c48e970d9ed239a28c8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2330225 Commit-Queue: Charlie Lao <cclao@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>

Vulkan: Avoid clearWithClearAttachment if RP command buffer is empty
dae77893 · Charlie Lao · Commit Bot · 9b1cab0d · dae77893 · dae77893
Commit dae77893 authored Jul 30, 2020 by Charlie Lao Committed by Commit Bot Jul 31, 2020
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

ContextVk.h src/libANGLE/renderer/vulkan/ContextVk.h +4 -0

FramebufferVk.cpp src/libANGLE/renderer/vulkan/FramebufferVk.cpp +3 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/ContextVk.h
+++ b/src/libANGLE/renderer/vulkan/ContextVk.h
@@ -529,6 +529,10 @@ class ContextVk : public ContextImpl, public vk::Context
                                          vk::CommandBuffer **commandBufferOut);
    bool hasStartedRenderPass() const { return mRenderPassCommands->started(); }
+    bool hasStartedRenderPassWithCommands() const
+    {
+        return mRenderPassCommands->started() && !mRenderPassCommands->getCommandBuffer().empty();
+    }
    vk::CommandBufferHelper &getStartedRenderPassCommands()
    {

--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -384,8 +384,9 @@ angle::Result FramebufferVk::clearImpl(const gl::Context *context,
        ANGLE_TRY(getFramebuffer(contextVk, &currentFramebuffer));
        bool framebufferIsCurrent = contextVk->isCurrentRenderPassOfFramebuffer(currentFramebuffer);
-        // If we are in an active renderpass and the framebuffer hasn't changed, inline the clear
+        // If we are in an active renderpass that has recorded commands and the framebuffer hasn't
-        if (contextVk->hasStartedRenderPass() && framebufferIsCurrent)
+        // changed, inline the clear
+        if (contextVk->hasStartedRenderPassWithCommands() && framebufferIsCurrent)
        {
            // Have active renderpass, add inline clear
            gl::DrawBufferMask clearBuffersWithInlineClear;