PipelineLayoutVk: add static version of GetPushConstantInfo

Author: TheMostDiligent

Graphics/GraphicsEngineVulkan/include/PipelineLayoutVk.hpp

@@ -47,9 +47,9 @@ class PipelineLayoutVk
     PipelineLayoutVk();
     ~PipelineLayoutVk();
 
-    void Create(RenderDeviceVkImpl*                            pDeviceVk,
-                RefCntAutoPtr<PipelineResourceSignatureVkImpl> ppSignatures[],
-                Uint32                                         SignatureCount) noexcept(false);
+    void Create(RenderDeviceVkImpl*                             pDeviceVk,
+                RefCntAutoPtr<PipelineResourceSignatureVkImpl>* ppSignatures,
+                Uint32                                          SignatureCount) noexcept(false);
     void Release(RenderDeviceVkImpl* pDeviceVkImpl, Uint64 CommandQueueMask);
 
     VkPipelineLayout GetVkPipelineLayout() const { return m_VkPipelineLayout; }
@@ -70,6 +70,9 @@ class PipelineLayoutVk
 
         constexpr explicit operator bool() const { return Size != 0; }
     };
+    static PushConstantInfo GetPushConstantInfo(const RefCntAutoPtr<PipelineResourceSignatureVkImpl>* ppSignatures,
+                                                Uint32                                                SignatureCount);
+
     const PushConstantInfo& GetPushConstantInfo() const { return m_PushConstantInfo; }
 
 private:

Graphics/GraphicsEngineVulkan/src/PipelineLayoutVk.cpp

@@ -59,9 +59,49 @@ void PipelineLayoutVk::Release(RenderDeviceVkImpl* pDeviceVk, Uint64 CommandQueu
     }
 }
 
-void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDeviceVk,
-                              RefCntAutoPtr<PipelineResourceSignatureVkImpl> ppSignatures[],
-                              Uint32                                         SignatureCount) noexcept(false)
+PipelineLayoutVk::PushConstantInfo PipelineLayoutVk::GetPushConstantInfo(
+    const RefCntAutoPtr<PipelineResourceSignatureVkImpl>* ppSignatures,
+    Uint32                                                SignatureCount)
+{
+    PushConstantInfo PCInfo;
+    for (Uint32 BindInd = 0; BindInd < SignatureCount; ++BindInd)
+    {
+        // Signatures are arranged by binding index by PipelineStateBase::CopyResourceSignatures
+        const RefCntAutoPtr<PipelineResourceSignatureVkImpl>& pSignature = ppSignatures[BindInd];
+        if (pSignature == nullptr)
+            continue;
+
+        // Vulkan allows only one push constant range per pipeline layout.
+        // Diligent API allows multiple inline constant resources, so we promote only the first inline constant
+        // from resource signatures to push constants. Other inline constants remain uniform buffers.
+        if (pSignature->HasInlineConstants())
+        {
+            for (Uint32 r = 0; r < pSignature->GetTotalResourceCount(); ++r)
+            {
+                const PipelineResourceDesc& ResDesc = pSignature->GetResourceDesc(r);
+                if (ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
+                {
+                    VERIFY_EXPR(ResDesc.ArraySize > 0);
+                    // For inline constants, ArraySize contains the number of 32-bit constants.
+                    PCInfo.Size           = ResDesc.ArraySize * sizeof(Uint32);
+                    PCInfo.StageFlags     = ShaderTypesToVkShaderStageFlags(ResDesc.ShaderStages);
+                    PCInfo.SignatureIndex = BindInd;
+                    PCInfo.ResourceIndex  = r;
+                    break;
+                }
+            }
+
+            VERIFY(PCInfo, "pSignature->HasInlineConstants() returned true, but no inline constant resource was found. This is a bug.");
+            break;
+        }
+    }
+
+    return PCInfo;
+}
+
+void PipelineLayoutVk::Create(RenderDeviceVkImpl*                             pDeviceVk,
+                              RefCntAutoPtr<PipelineResourceSignatureVkImpl>* ppSignatures,
+                              Uint32                                          SignatureCount) noexcept(false)
 {
     VERIFY(m_DescrSetCount == 0 && !m_VkPipelineLayout, "This pipeline layout is already initialized");
 
@@ -94,27 +134,6 @@ void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDe
 #ifdef DILIGENT_DEBUG
         m_DbgMaxBindIndex = std::max(m_DbgMaxBindIndex, Uint32{pSignature->GetDesc().BindingIndex});
 #endif
-
-        // Vulkan allows only one push constant range per pipeline layout.
-        // Diligent API allows multiple inline constant resources, so we promote only the first inline constant
-        // from resource signatures to push constants. Other inline constants remain uniform buffers.
-        if (!m_PushConstantInfo && pSignature->HasInlineConstants())
-        {
-            for (Uint32 r = 0; r < pSignature->GetTotalResourceCount(); ++r)
-            {
-                const PipelineResourceDesc& ResDesc = pSignature->GetResourceDesc(r);
-                if (ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
-                {
-                    VERIFY_EXPR(ResDesc.ArraySize > 0);
-                    // For inline constants, ArraySize contains the number of 32-bit constants.
-                    m_PushConstantInfo.Size           = ResDesc.ArraySize * sizeof(Uint32);
-                    m_PushConstantInfo.StageFlags     = ShaderTypesToVkShaderStageFlags(ResDesc.ShaderStages);
-                    m_PushConstantInfo.SignatureIndex = BindInd;
-                    m_PushConstantInfo.ResourceIndex  = r;
-                    break;
-                }
-            }
-        }
     }
     VERIFY_EXPR(DescSetLayoutCount <= MAX_RESOURCE_SIGNATURES * 2);
 
@@ -137,42 +156,37 @@ void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDe
                             ") used by the pipeline layout exceeds device limit (", Limits.maxDescriptorSetStorageBuffersDynamic, ")");
     }
 
-    // Validate push constant size against device limits
-    if (m_PushConstantInfo.Size > Limits.maxPushConstantsSize)
-    {
-        LOG_ERROR_AND_THROW("Push constant size (", m_PushConstantInfo.Size,
-                            " bytes) exceeds device limit (", Limits.maxPushConstantsSize, " bytes)");
-    }
-
-    VERIFY(m_DescrSetCount <= std::numeric_limits<decltype(m_DescrSetCount)>::max(),
-           "Descriptor set count (", DescSetLayoutCount, ") exceeds the maximum representable value");
-
-    VkPipelineLayoutCreateInfo PipelineLayoutCI{};
-    PipelineLayoutCI.sType          = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
-    PipelineLayoutCI.pNext          = nullptr;
-    PipelineLayoutCI.flags          = 0; // reserved for future use
-    PipelineLayoutCI.setLayoutCount = DescSetLayoutCount;
-    PipelineLayoutCI.pSetLayouts    = DescSetLayoutCount ? DescSetLayouts.data() : nullptr;
+    m_PushConstantInfo = GetPushConstantInfo(ppSignatures, SignatureCount);
 
     // Set up push constant range if present
     VkPushConstantRange PushConstantRange{};
     if (m_PushConstantInfo)
     {
+        // Validate push constant size against device limits
+        if (m_PushConstantInfo.Size > Limits.maxPushConstantsSize)
+        {
+            LOG_ERROR_AND_THROW("Push constant size (", m_PushConstantInfo.Size,
+                                " bytes) exceeds device limit (", Limits.maxPushConstantsSize, " bytes)");
+        }
+
         PushConstantRange.stageFlags = m_PushConstantInfo.StageFlags;
         PushConstantRange.offset     = 0;
         PushConstantRange.size       = m_PushConstantInfo.Size;
-
-        PipelineLayoutCI.pushConstantRangeCount = 1;
-        PipelineLayoutCI.pPushConstantRanges    = &PushConstantRange;
-    }
-    else
-    {
-        PipelineLayoutCI.pushConstantRangeCount = 0;
-        PipelineLayoutCI.pPushConstantRanges    = nullptr;
     }
 
+    VkPipelineLayoutCreateInfo PipelineLayoutCI{};
+    PipelineLayoutCI.sType                  = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+    PipelineLayoutCI.pNext                  = nullptr;
+    PipelineLayoutCI.flags                  = 0; // reserved for future use
+    PipelineLayoutCI.setLayoutCount         = DescSetLayoutCount;
+    PipelineLayoutCI.pSetLayouts            = DescSetLayoutCount ? DescSetLayouts.data() : nullptr;
+    PipelineLayoutCI.pushConstantRangeCount = m_PushConstantInfo ? 1 : 0;
+    PipelineLayoutCI.pPushConstantRanges    = m_PushConstantInfo ? &PushConstantRange : nullptr;
+
     m_VkPipelineLayout = pDeviceVk->GetLogicalDevice().CreatePipelineLayout(PipelineLayoutCI);
 
+    VERIFY(DescSetLayoutCount <= std::numeric_limits<decltype(m_DescrSetCount)>::max(),
+           "Descriptor set count (", DescSetLayoutCount, ") exceeds the maximum representable value");
     m_DescrSetCount = static_cast<Uint8>(DescSetLayoutCount);
 }