igl | vulkan | Fix resolve depth attachment missing in 'vkCreateRenderPass'. (#342)

Summary: Pull Request resolved: #342

Reviewed By: mmaurer, pixelperfect3

Differential Revision: D91505532

Pulled By: corporateshark

fbshipit-source-id: 6c67f23c1866791766c82a1667b807ed1d6918c5

Author: vinsentli

src/igl/vulkan/RenderCommandEncoder.cpp

@@ -200,6 +200,25 @@ void RenderCommandEncoder::initialize(const RenderPassDesc& renderPass,
                             initialLayout,
                             VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
                             depthTexture.getVulkanTexture().image_.samples_);
+
+    // handle MSAA
+    if (renderPass.depthAttachment.storeAction == StoreAction::MsaaResolve) {
+      IGL_DEBUG_ASSERT(framebuffer->getResolveDepthAttachment(),
+                       "Framebuffer attachment should contain a resolve depth texture");
+      const auto& depthResolveTexture =
+          static_cast<Texture&>(*framebuffer->getResolveDepthAttachment());
+      builder.addDepthStencilResolve(depthResolveTexture.getVkFormat(),
+                                     VK_ATTACHMENT_LOAD_OP_DONT_CARE,
+                                     VK_ATTACHMENT_STORE_OP_STORE,
+                                     VK_ATTACHMENT_LOAD_OP_DONT_CARE,
+                                     VK_ATTACHMENT_STORE_OP_STORE,
+                                     initialLayout,
+                                     VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
+      clearValues.push_back(VkClearValue{.depthStencil = {
+                                             .depth = descDepth.clearDepth,
+                                             .stencil = descStencil.clearStencil,
+                                         }});
+    }
   }
 
   const auto& fb = static_cast<Framebuffer&>(*framebuffer);

src/igl/vulkan/VulkanRenderPassBuilder.cpp

@@ -72,8 +72,19 @@ VkResult VulkanRenderPassBuilder::build(const VulkanFunctionTable& vf,
   };
 #endif // IGL_VULKAN_HAS_LEGACY_RENDERPASS
 
+  const bool hasDepthStencilResolve = refDepthResolve2_.layout != VK_IMAGE_LAYOUT_UNDEFINED;
+
+  const VkSubpassDescriptionDepthStencilResolve depthStencilResolve = {
+      .sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE,
+      .pNext = nullptr,
+      .depthResolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT,
+      .stencilResolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT,
+      .pDepthStencilResolveAttachment = hasDepthStencilResolve ? &refDepthResolve2_ : nullptr,
+  };
+
   const VkSubpassDescription2 subpass2 = {
       .sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2,
+      .pNext = hasDepthStencilResolve ? &depthStencilResolve : nullptr,
       .flags = 0,
       .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
       .viewMask = viewMask_,