DeviceContextVk: set dynamic rendering view mask when committing render pass

Author: TheMostDiligent

Graphics/GraphicsEngineVulkan/include/FramebufferCache.hpp

@@ -81,9 +81,8 @@ class FramebufferCache
 
     struct CreateDyanmicRenderInfoAttribs
     {
-        VkExtent2D Extent   = {};
-        uint32_t   Layers   = 0;
-        uint32_t   ViewMask = 0;
+        VkExtent2D Extent = {};
+        uint32_t   Layers = 0;
 
         VkExtent2D ShadingRateTexelSize = {};
 

Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp

@@ -1832,6 +1832,8 @@ void DeviceContextVkImpl::CommitRenderPassAndFramebuffer(bool VerifyStates)
         }
         else if (DynamicRenderingHash != 0)
         {
+            // Set view mask now as viewports may not be set when ChooseRenderPassAndFramebuffer() is called
+            m_DynamicRenderingInfo->SetViewMask((1u << m_NumViewports) - 1u);
             m_CommandBuffer.BeginRendering(*m_DynamicRenderingInfo, DynamicRenderingHash);
         }
     }
@@ -1912,9 +1914,8 @@ void DeviceContextVkImpl::ChooseRenderPassAndFramebuffer()
     else
     {
         FramebufferCache::CreateDyanmicRenderInfoAttribs CreateRIAttribs;
-        CreateRIAttribs.Extent   = {m_FramebufferWidth, m_FramebufferHeight};
-        CreateRIAttribs.Layers   = m_FramebufferSlices;
-        CreateRIAttribs.ViewMask = (1u << m_NumViewports) - 1u;
+        CreateRIAttribs.Extent = {m_FramebufferWidth, m_FramebufferHeight};
+        CreateRIAttribs.Layers = m_FramebufferSlices;
         if (m_pBoundDepthStencil)
         {
             const TEXTURE_FORMAT        DepthStencilFmt = m_pBoundDepthStencil->GetTexture()->GetDesc().Format;

Graphics/GraphicsEngineVulkan/src/FramebufferCache.cpp

@@ -143,9 +143,8 @@ std::unique_ptr<VulkanUtilities::RenderingInfoWrapper> FramebufferCache::CreateD
     std::unique_ptr<VulkanUtilities::RenderingInfoWrapper> RI = std::make_unique<VulkanUtilities::RenderingInfoWrapper>(
         Key.GetHash(), Key.NumRenderTargets, Attribs.UseDepthAttachment, Attribs.UseStencilAttachment);
 
-    RI->SetRenderArea({{0, 0}, Attribs.Extent})
-        .SetLayerCount(Attribs.Layers)
-        .SetViewMask(Attribs.ViewMask);
+    RI->SetRenderArea({{0, 0}, Attribs.Extent});
+    RI->SetLayerCount(Attribs.Layers);
 
     auto InitAttachment = [](VkRenderingAttachmentInfoKHR& Attachment, VkImageView View, VkImageLayout Layout) {
         Attachment.imageView          = View;