Vulkan: Fix resolve-with-subpass retaining resolve attachment

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -1239,6 +1239,14 @@ void FramebufferVk::updateColorResolveAttachment(
     mRenderPassDesc.packColorResolveAttachment(colorIndexGL);
 }
 
+void FramebufferVk::removeColorResolveAttachment(uint32_t colorIndexGL)
+{
+    mCurrentFramebufferDesc.updateColorResolve(colorIndexGL,
+                                               vk::kInvalidImageViewSubresourceSerial);
+    mFramebuffer = nullptr;
+    mRenderPassDesc.removeColorResolveAttachment(colorIndexGL);
+}
+
 angle::Result FramebufferVk::resolveColorWithSubpass(ContextVk *contextVk,
                                                      const UtilsVk::BlitResolveParameters &params)
 {
@@ -1284,6 +1292,9 @@ angle::Result FramebufferVk::resolveColorWithSubpass(ContextVk *contextVk,
                                       &readRenderTarget->getImageForRenderPass());
     ANGLE_TRY(contextVk->flushCommandsAndEndRenderPass());
 
+    // Remove the resolve attachment from the source framebuffer.
+    srcFramebufferVk->removeColorResolveAttachment(readColorIndexGL);
+
     return angle::Result::Continue;
 }
 

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -235,6 +235,7 @@ class FramebufferVk : public FramebufferImpl
 
     void updateColorResolveAttachment(uint32_t colorIndexGL,
                                       vk::ImageViewSubresourceSerial resolveImageViewSerial);
+    void removeColorResolveAttachment(uint32_t colorIndexGL);
 
     WindowSurfaceVk *mBackbuffer;
 

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -552,10 +552,17 @@ void RenderPassDesc::packDepthStencilAttachment(angle::FormatID formatID, Resour
 void RenderPassDesc::packColorResolveAttachment(size_t colorIndexGL)
 {
     ASSERT(isColorAttachmentEnabled(colorIndexGL));
+    ASSERT(!mColorResolveAttachmentMask.test(colorIndexGL));
     ASSERT(mLogSamples > 0);
     mColorResolveAttachmentMask.set(colorIndexGL);
 }
 
+void RenderPassDesc::removeColorResolveAttachment(size_t colorIndexGL)
+{
+    ASSERT(mColorResolveAttachmentMask.test(colorIndexGL));
+    mColorResolveAttachmentMask.reset(colorIndexGL);
+}
+
 RenderPassDesc &RenderPassDesc::operator=(const RenderPassDesc &other)
 {
     memcpy(this, &other, sizeof(RenderPassDesc));

src/libANGLE/renderer/vulkan/vk_cache_utils.h

@@ -123,6 +123,9 @@ class alignas(4) RenderPassDesc final
     void packDepthStencilAttachment(angle::FormatID angleFormatID, ResourceAccess access);
     // Indicate that a color attachment should have a corresponding resolve attachment.
     void packColorResolveAttachment(size_t colorIndexGL);
+    // Remove the resolve attachment.  Used when optimizing blit through resolve attachment to
+    // temporarily pack a resolve attachment and then remove it.
+    void removeColorResolveAttachment(size_t colorIndexGL);
 
     size_t hash() const;