Vulkan: Invalidate/restore depth/stencil separately.

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -2568,6 +2568,7 @@ void ContextVk::optimizeRenderPassForPresent(VkFramebuffer framebufferHandle)
         mRenderPassCommands->invalidateRenderPassDepthAttachment(dsState);
         // Mark content as invalid so that we will not load them in next renderpass
         depthStencilRenderTarget->invalidateEntireContent(this);
+        depthStencilRenderTarget->invalidateEntireStencilContent(this);
     }
 
     // Use finalLayout instead of extra barrier for layout change to present
@@ -5131,12 +5132,12 @@ angle::Result ContextVk::updateRenderPassDepthStencilAccess()
             if (mRenderPassCommands->onDepthAccess(depthAccess))
             {
                 // The attachment is no longer invalidated, so set mContentDefined to true
-                mDrawFramebuffer->restoreDepthStencilDefinedContents();
+                mDrawFramebuffer->restoreDepthDefinedContents();
             }
             if (mRenderPassCommands->onStencilAccess(stencilAccess))
             {
                 // The attachment is no longer invalidated, so set mContentDefined to true
-                mDrawFramebuffer->restoreDepthStencilDefinedContents();
+                mDrawFramebuffer->restoreStencilDefinedContents();
             }
 
             mDrawFramebuffer->updateRenderPassReadOnlyDepthMode(this, mRenderPassCommands);

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -1522,12 +1522,18 @@ angle::Result FramebufferVk::invalidateImpl(ContextVk *contextVk,
             }
         }
 
-        // If we have a depth / stencil render target AND we invalidate both we'll mark it as
-        // invalid. Maybe in the future add separate depth & stencil invalid flags.
-        if (depthStencilRenderTarget && invalidateDepthBuffer && invalidateStencilBuffer)
+        // If we have a depth / stencil render target, invalidate its aspects.
+        if (depthStencilRenderTarget)
+        {
+            if (invalidateDepthBuffer)
             {
                 depthStencilRenderTarget->invalidateEntireContent(contextVk);
             }
+            if (invalidateStencilBuffer)
+            {
+                depthStencilRenderTarget->invalidateEntireStencilContent(contextVk);
+            }
+        }
     }
 
     return angle::Result::Continue;
@@ -2207,7 +2213,7 @@ angle::Result FramebufferVk::clearWithCommand(
         if (renderpassCommands->onDepthAccess(vk::ResourceAccess::Write))
         {
             // The attachment is no longer invalidated, so set mContentDefined to true
-            restoreDepthStencilDefinedContents();
+            restoreDepthDefinedContents();
         }
     }
 
@@ -2219,7 +2225,7 @@ angle::Result FramebufferVk::clearWithCommand(
         if (renderpassCommands->onStencilAccess(vk::ResourceAccess::Write))
         {
             // The attachment is no longer invalidated, so set mContentDefined to true
-            restoreDepthStencilDefinedContents();
+            restoreStencilDefinedContents();
         }
     }
 
@@ -2360,6 +2366,10 @@ angle::Result FramebufferVk::startNewRenderPass(ContextVk *contextVk,
             depthStencilRenderTarget->isEntirelyTransient())
         {
             depthLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+        }
+        if (!depthStencilRenderTarget->hasDefinedStencilContent() ||
+            depthStencilRenderTarget->isEntirelyTransient())
+        {
             stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
         }
 
@@ -2494,7 +2504,7 @@ angle::Result FramebufferVk::startNewRenderPass(ContextVk *contextVk,
 
     if (depthStencilRenderTarget)
     {
-        // This must be called after hasDefinedContent() since it will set content to valid. We are
+        // This must be called after hasDefined*Content() since it will set content to valid. We are
         // tracking content valid very loosely here that as long as it is attached, it assumes will
         // have valid content. The only time it has undefined content is between swap and
         // startNewRenderPass
@@ -2519,7 +2529,7 @@ angle::Result FramebufferVk::startNewRenderPass(ContextVk *contextVk,
     return angle::Result::Continue;
 }
 
-void FramebufferVk::restoreDepthStencilDefinedContents()
+void FramebufferVk::restoreDepthDefinedContents()
 {
     // If the depthStencilRenderTarget does not have "defined content" (i.e. meaning that a future
     // render pass should use a loadOp of DONT_CARE), we should restore it (i.e. so that a future
@@ -2531,6 +2541,16 @@ void FramebufferVk::restoreDepthStencilDefinedContents()
     }
 }
 
+void FramebufferVk::restoreStencilDefinedContents()
+{
+    // Similar to restoreDepthDefinedContents, but for the stencil aspect.
+    RenderTargetVk *depthStencilRenderTarget = mRenderTargetCache.getDepthStencil();
+    if (depthStencilRenderTarget)
+    {
+        depthStencilRenderTarget->restoreEntireStencilContent();
+    }
+}
+
 void FramebufferVk::updateActiveColorMasks(size_t colorIndexGL, bool r, bool g, bool b, bool a)
 {
     gl::BlendStateExt::ColorMaskStorage::SetValueIndexed(

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -118,7 +118,8 @@ class FramebufferVk : public FramebufferImpl
     angle::Result startNewRenderPass(ContextVk *contextVk,
                                      const gl::Rectangle &renderArea,
                                      vk::CommandBuffer **commandBufferOut);
-    void restoreDepthStencilDefinedContents();
+    void restoreDepthDefinedContents();
+    void restoreStencilDefinedContents();
 
     RenderTargetVk *getFirstRenderTarget() const;
     GLint getSamples() const;

src/libANGLE/renderer/vulkan/RenderTargetVk.cpp

@@ -278,31 +278,37 @@ void RenderTargetVk::retainImageViews(ContextVk *contextVk) const
 bool RenderTargetVk::hasDefinedContent() const
 {
     vk::ImageHelper *image = getOwnerOfData();
-    // TODO: separate depth and stencil defined content.  https://issuetracker.google.com/167275320
-    return image->hasSubresourceDefinedContent(mLevelIndexGL, mLayerIndex) ||
-           image->hasSubresourceDefinedStencilContent(mLevelIndexGL, mLayerIndex);
+    return image->hasSubresourceDefinedContent(mLevelIndexGL, mLayerIndex);
+}
+
+bool RenderTargetVk::hasDefinedStencilContent() const
+{
+    vk::ImageHelper *image = getOwnerOfData();
+    return image->hasSubresourceDefinedStencilContent(mLevelIndexGL, mLayerIndex);
 }
 
 void RenderTargetVk::invalidateEntireContent(ContextVk *contextVk)
 {
     vk::ImageHelper *image = getOwnerOfData();
-    // TODO: separate depth and stencil defined content.  https://issuetracker.google.com/167275320
     image->invalidateSubresourceContent(contextVk, mLevelIndexGL, mLayerIndex);
-    if ((image->getAspectFlags() & VK_IMAGE_ASPECT_STENCIL_BIT) != 0)
-    {
+}
+
+void RenderTargetVk::invalidateEntireStencilContent(ContextVk *contextVk)
+{
+    vk::ImageHelper *image = getOwnerOfData();
     image->invalidateSubresourceStencilContent(contextVk, mLevelIndexGL, mLayerIndex);
-    }
 }
 
 void RenderTargetVk::restoreEntireContent()
 {
     vk::ImageHelper *image = getOwnerOfData();
-    // TODO: separate depth and stencil defined content.  https://issuetracker.google.com/167275320
     image->restoreSubresourceContent(mLevelIndexGL, mLayerIndex);
-    if ((image->getAspectFlags() & VK_IMAGE_ASPECT_STENCIL_BIT) != 0)
-    {
+}
+
+void RenderTargetVk::restoreEntireStencilContent()
+{
+    vk::ImageHelper *image = getOwnerOfData();
     image->restoreSubresourceStencilContent(mLevelIndexGL, mLayerIndex);
-    }
 }
 
 gl::ImageIndex RenderTargetVk::getImageIndex() const

src/libANGLE/renderer/vulkan/RenderTargetVk.h

@@ -109,10 +109,13 @@ class RenderTargetVk final : public FramebufferAttachmentRenderTarget
     void retainImageViews(ContextVk *contextVk) const;
 
     bool hasDefinedContent() const;
+    bool hasDefinedStencilContent() const;
     // Mark content as undefined so that certain optimizations are possible such as using DONT_CARE
     // as loadOp of the render target in the next renderpass.
     void invalidateEntireContent(ContextVk *contextVk);
+    void invalidateEntireStencilContent(ContextVk *contextVk);
     void restoreEntireContent();
+    void restoreEntireStencilContent();
 
     // See the description of mTransience for details of how the following two can interact.
     bool hasResolveAttachment() const { return mResolveImage != nullptr && !isEntirelyTransient(); }
@@ -141,7 +144,7 @@ class RenderTargetVk final : public FramebufferAttachmentRenderTarget
     // implement GL_EXT_multisampled_render_to_texture, so while the rendering is done on mImage
     // during the renderpass, the resolved image is the one that actually holds the data.  This
     // means that data uploads and blit are done on this image, copies are done out of this image
-    // etc.  This means that if there is no clear, and hasDefinedContent(), the contents of
+    // etc.  This means that if there is no clear, and hasDefined*Content(), the contents of
     // mResolveImage must be copied to mImage since the loadOp of the attachment must be set to
     // LOAD.
     vk::ImageHelper *mResolveImage;