DeviceContextVk: support read-only depth with dynamic rendering

TheMostDiligent · TheMostDiligent · commit 235fabe20879 · 2025-02-02T09:11:18.000-08:00
diff --git a/Graphics/GraphicsEngineVulkan/include/FramebufferCache.hpp b/Graphics/GraphicsEngineVulkan/include/FramebufferCache.hpp
@@ -89,6 +89,7 @@ class FramebufferCache
 
         bool UseDepthAttachment   = false;
         bool UseStencilAttachment = false;
+        bool ReadOnlyDepthStencil = false;
     };
     static std::unique_ptr<VulkanUtilities::RenderingInfoWrapper> CreateDyanmicRenderInfo(
         const FramebufferCacheKey&            Key,
diff --git a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
@@ -1922,6 +1922,7 @@ void DeviceContextVkImpl::ChooseRenderPassAndFramebuffer()
 
             CreateRIAttribs.UseDepthAttachment   = true;
             CreateRIAttribs.UseStencilAttachment = FmtAttribs.ComponentType == COMPONENT_TYPE_DEPTH_STENCIL;
+            CreateRIAttribs.ReadOnlyDepthStencil = (m_pBoundDepthStencil->GetDesc().ViewType == TEXTURE_VIEW_READ_ONLY_DEPTH_STENCIL);
         }
         if (m_pBoundShadingRateMap)
         {
diff --git a/Graphics/GraphicsEngineVulkan/src/FramebufferCache.cpp b/Graphics/GraphicsEngineVulkan/src/FramebufferCache.cpp
@@ -167,13 +167,13 @@ std::unique_ptr<VulkanUtilities::RenderingInfoWrapper> FramebufferCache::CreateD
     if (Attribs.UseDepthAttachment)
     {
         VkRenderingAttachmentInfoKHR& DepthAttachment = RI->GetDepthAttachment();
-        InitAttachment(DepthAttachment, Key.DSV, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
+        InitAttachment(DepthAttachment, Key.DSV, Attribs.ReadOnlyDepthStencil ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
     }
 
     if (Attribs.UseStencilAttachment)
     {
         VkRenderingAttachmentInfoKHR& StencilAttachment = RI->GetStencilAttachment();
-        InitAttachment(StencilAttachment, Key.DSV, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
+        InitAttachment(StencilAttachment, Key.DSV, Attribs.ReadOnlyDepthStencil ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
     }
 
     if (Key.ShadingRate)

Original file line number	Diff line number	Diff line change
`@@ -1922,6 +1922,7 @@ void DeviceContextVkImpl::ChooseRenderPassAndFramebuffer()`
`1922`	`1922`
`1923`	`1923`	`CreateRIAttribs.UseDepthAttachment = true;`
`1924`	`1924`	`CreateRIAttribs.UseStencilAttachment = FmtAttribs.ComponentType == COMPONENT_TYPE_DEPTH_STENCIL;`
	`1925`	`+ CreateRIAttribs.ReadOnlyDepthStencil = (m_pBoundDepthStencil->GetDesc().ViewType == TEXTURE_VIEW_READ_ONLY_DEPTH_STENCIL);`
`1925`	`1926`	`}`
`1926`	`1927`	`if (m_pBoundShadingRateMap)`
`1927`	`1928`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,13 +167,13 @@ std::unique_ptr<VulkanUtilities::RenderingInfoWrapper> FramebufferCache::CreateD`
`167`	`167`	`if (Attribs.UseDepthAttachment)`
`168`	`168`	`{`
`169`	`169`	`VkRenderingAttachmentInfoKHR& DepthAttachment = RI->GetDepthAttachment();`
`170`		`- InitAttachment(DepthAttachment, Key.DSV, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);`
	`170`	`+ InitAttachment(DepthAttachment, Key.DSV, Attribs.ReadOnlyDepthStencil ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if (Attribs.UseStencilAttachment)`
`174`	`174`	`{`
`175`	`175`	`VkRenderingAttachmentInfoKHR& StencilAttachment = RI->GetStencilAttachment();`
`176`		`- InitAttachment(StencilAttachment, Key.DSV, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);`
	`176`	`+ InitAttachment(StencilAttachment, Key.DSV, Attribs.ReadOnlyDepthStencil ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if (Key.ShadingRate)`