Move push constants promotion to "PipelineLayoutVk::Create" , PipelineLayoutVk should be completely responsible for initializing the layout. (DiligentGraphics#747)

hzqst · hzqst · commit c65c3abe378d · 2026-01-02T11:45:05.000+08:00
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineLayoutVk.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineLayoutVk.hpp
@@ -40,15 +40,6 @@ namespace Diligent
 class RenderDeviceVkImpl;
 class PipelineResourceSignatureVkImpl;
 
-/// Push constant information extracted from shaders or selected from inline constants
-struct PushConstantInfoVk
-{
-    VkShaderStageFlags StageFlags     = 0;
-    Uint32             Size           = 0;
-    Uint32             SignatureIndex = ~0u; // Index of the signature containing the push constant (~0u if none)
-    Uint32             ResourceIndex  = ~0u; // Resource index within the signature (~0u if none)
-};
-
 static constexpr Uint32 INVALID_PUSH_CONSTANT_INDEX = ~0u;
 
 /// Implementation of the Diligent::PipelineLayoutVk class
@@ -60,8 +51,7 @@ class PipelineLayoutVk
 
     void Create(RenderDeviceVkImpl*                            pDeviceVk,
                 RefCntAutoPtr<PipelineResourceSignatureVkImpl> ppSignatures[],
-                Uint32                                         SignatureCount,
-                const PushConstantInfoVk&                      PushConstant = {}) noexcept(false);
+                Uint32                                         SignatureCount) noexcept(false);
     void Release(RenderDeviceVkImpl* pDeviceVkImpl, Uint64 CommandQueueMask);
 
     VkPipelineLayout GetVkPipelineLayout() const { return m_VkPipelineLayout; }
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
@@ -134,11 +134,9 @@ class PipelineStateVkImpl final : public PipelineStateBase<EngineVkImplTraits>
     void InitializePipeline(const ComputePipelineStateCreateInfo& CreateInfo);
     void InitializePipeline(const RayTracingPipelineStateCreateInfo& CreateInfo);
 
-    bool InitPushConstantInfoFromSignatures(PushConstantInfoVk& PushConstant,
-                                            TShaderStages&      ShaderStages) const noexcept(false);
+    void ValidateShaderPushConstants(const TShaderStages& ShaderStages) const noexcept(false);
 
-    void PatchShaderConvertUniformBufferToPushConstant(const PushConstantInfoVk& PushConstant,
-                                                       TShaderStages&            ShaderStages) const noexcept(false);
+    void PatchShaderConvertUniformBufferToPushConstant(TShaderStages& ShaderStages) const noexcept(false);
 
     // TPipelineStateBase::Construct needs access to InitializePipeline
     friend TPipelineStateBase;
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineLayoutVk.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineLayoutVk.cpp
@@ -61,8 +61,7 @@ void PipelineLayoutVk::Release(RenderDeviceVkImpl* pDeviceVk, Uint64 CommandQueu
 
 void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDeviceVk,
                               RefCntAutoPtr<PipelineResourceSignatureVkImpl> ppSignatures[],
-                              Uint32                                         SignatureCount,
-                              const PushConstantInfoVk&                      PushConstant) noexcept(false)
+                              Uint32                                         SignatureCount) noexcept(false)
 {
     VERIFY(m_DescrSetCount == 0 && !m_VkPipelineLayout, "This pipeline layout is already initialized");
 
@@ -72,6 +71,12 @@ void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDe
     Uint32 DynamicUniformBufferCount = 0;
     Uint32 DynamicStorageBufferCount = 0;
 
+    // Extract push constant info from signatures.
+    // Vulkan allows only one push constant range per pipeline layout.
+    // DiligentCore 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.
+    const PipelineResourceDesc* pPushConstantResDesc = nullptr;
+
     for (Uint32 BindInd = 0; BindInd < SignatureCount; ++BindInd)
     {
         // Signatures are arranged by binding index by PipelineStateBase::CopyResourceSignatures
@@ -95,6 +100,29 @@ void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDe
 #ifdef DILIGENT_DEBUG
         m_DbgMaxBindIndex = std::max(m_DbgMaxBindIndex, Uint32{pSignature->GetDesc().BindingIndex});
 #endif
+
+        // Find the first inline constant resource (only if not already found)
+        if (pPushConstantResDesc == nullptr)
+        {
+            for (Uint32 r = 0; r < pSignature->GetTotalResourceCount(); ++r)
+            {
+                const PipelineResourceDesc& ResDesc = pSignature->GetResourceDesc(r);
+                if (ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
+                {
+                    pPushConstantResDesc         = &ResDesc;
+                    m_PushConstantSignatureIndex = BindInd;
+                    m_PushConstantResourceIndex  = r;
+                    // For inline constants, ArraySize contains the number of 32-bit constants.
+                    m_PushConstantSize = ResDesc.ArraySize * sizeof(Uint32);
+                    for (SHADER_TYPE ShaderTypes = ResDesc.ShaderStages; ShaderTypes != SHADER_TYPE_UNKNOWN;)
+                    {
+                        const SHADER_TYPE ShaderType = ExtractLSB(ShaderTypes);
+                        m_PushConstantStageFlags |= ShaderTypeToVkShaderStageFlagBit(ShaderType);
+                    }
+                    break;
+                }
+            }
+        }
     }
     VERIFY_EXPR(DescSetLayoutCount <= MAX_RESOURCE_SIGNATURES * 2);
 
@@ -118,11 +146,11 @@ void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDe
     }
 
     // Validate push constant size against device limits
-    if (PushConstant.Size > 0)
+    if (m_PushConstantSize > 0)
     {
-        if (PushConstant.Size > Limits.maxPushConstantsSize)
+        if (m_PushConstantSize > Limits.maxPushConstantsSize)
         {
-            LOG_ERROR_AND_THROW("Push constant size (", PushConstant.Size,
+            LOG_ERROR_AND_THROW("Push constant size (", m_PushConstantSize,
                                 " bytes) exceeds device limit (", Limits.maxPushConstantsSize, " bytes)");
         }
     }
@@ -140,19 +168,14 @@ void PipelineLayoutVk::Create(RenderDeviceVkImpl*                            pDe
 
     // Set up push constant range if present
     VkPushConstantRange PushConstantRange = {};
-    if (PushConstant.Size > 0 && PushConstant.StageFlags != 0)
+    if (m_PushConstantSize > 0 && m_PushConstantStageFlags != 0)
     {
-        PushConstantRange.stageFlags = PushConstant.StageFlags;
+        PushConstantRange.stageFlags = m_PushConstantStageFlags;
         PushConstantRange.offset     = 0;
-        PushConstantRange.size       = PushConstant.Size;
+        PushConstantRange.size       = m_PushConstantSize;
 
         PipelineLayoutCI.pushConstantRangeCount = 1;
         PipelineLayoutCI.pPushConstantRanges    = &PushConstantRange;
-
-        m_PushConstantSize           = PushConstant.Size;
-        m_PushConstantStageFlags     = PushConstant.StageFlags;
-        m_PushConstantSignatureIndex = PushConstant.SignatureIndex;
-        m_PushConstantResourceIndex  = PushConstant.ResourceIndex;
     }
     else
     {
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
@@ -821,41 +821,18 @@ void PipelineStateVkImpl::RemapOrVerifyShaderResources(
     }
 }
 
-bool PipelineStateVkImpl::InitPushConstantInfoFromSignatures(PushConstantInfoVk& PushConstant,
-                                                             TShaderStages&      ShaderStages) const noexcept(false)
+void PipelineStateVkImpl::ValidateShaderPushConstants(const TShaderStages& ShaderStages) const noexcept(false)
 {
-    // Vulkan allows only one push constant range per pipeline layout.
-    // DiligentCore 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.
-    const PipelineResourceDesc* pResDesc            = nullptr;
-    const char*                 PushConstantName    = nullptr;
-    Uint32                      PushConstantSize    = 0;
-    Uint32                      PushConstantSignIdx = INVALID_PUSH_CONSTANT_INDEX;
-    Uint32                      PushConstantResIdx  = INVALID_PUSH_CONSTANT_INDEX;
+    const Uint32 PushConstantSignIdx = m_PipelineLayout.GetPushConstantSignatureIndex();
+    const Uint32 PushConstantResIdx  = m_PipelineLayout.GetPushConstantResourceIndex();
+    const Uint32 PushConstantSize    = m_PipelineLayout.GetPushConstantSize();
 
-    for (Uint32 s = 0; s < m_SignatureCount; ++s)
+    const char* PushConstantName = nullptr;
+    if (PushConstantSignIdx != INVALID_PUSH_CONSTANT_INDEX && PushConstantResIdx != INVALID_PUSH_CONSTANT_INDEX)
     {
-        const PipelineResourceSignatureVkImpl* pSignature = m_Signatures[s];
-        if (pSignature == nullptr)
-            continue;
-
-        for (Uint32 r = 0; r < pSignature->GetTotalResourceCount(); ++r)
-        {
-            const PipelineResourceDesc& ResDesc = pSignature->GetResourceDesc(r);
-            if ((ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) == 0)
-                continue;
-
-            // For inline constants, ArraySize contains the number of 32-bit constants.
-            PushConstantSize    = ResDesc.ArraySize * sizeof(Uint32);
-            PushConstantSignIdx = s;
-            PushConstantResIdx  = r;
-            PushConstantName    = ResDesc.Name;
-            pResDesc            = &ResDesc;
-            break;
-        }
-
-        if (pResDesc != nullptr)
-            break;
+        const PipelineResourceSignatureVkImpl* pSignature = m_Signatures[PushConstantSignIdx];
+        if (pSignature != nullptr)
+            PushConstantName = pSignature->GetResourceDesc(PushConstantResIdx).Name;
     }
 
     // Validate shader-declared push constants against the selected inline constant (if any).
@@ -871,7 +848,7 @@ bool PipelineStateVkImpl::InitPushConstantInfoFromSignatures(PushConstantInfoVk&
             {
                 const SPIRVShaderResourceAttribs& PCAttribs = pShaderResources->GetPushConstant(pc);
 
-                if (pResDesc == nullptr)
+                if (PushConstantName == nullptr)
                 {
                     LOG_ERROR_AND_THROW("Shader '", pShader->GetDesc().Name, "' defines push constants block '", PCAttribs.Name,
                                         "', but the pipeline resource signatures define no inline constant resource to promote to push constants.");
@@ -893,24 +870,6 @@ bool PipelineStateVkImpl::InitPushConstantInfoFromSignatures(PushConstantInfoVk&
             }
         }
     }
-
-    if (pResDesc == nullptr)
-    {
-        // No inline constants found - PushConstant remains empty.
-        return false;
-    }
-
-    PushConstant.Size           = PushConstantSize;
-    PushConstant.SignatureIndex = PushConstantSignIdx;
-    PushConstant.ResourceIndex  = PushConstantResIdx;
-
-    for (SHADER_TYPE ShaderTypes = pResDesc->ShaderStages; ShaderTypes != SHADER_TYPE_UNKNOWN;)
-    {
-        const SHADER_TYPE ShaderType = ExtractLSB(ShaderTypes);
-        PushConstant.StageFlags |= ShaderTypeToVkShaderStageFlagBit(ShaderType);
-    }
-
-    return true;
 }
 
 void PipelineStateVkImpl::InitPipelineLayout(const PipelineStateCreateInfo& CreateInfo, TShaderStages& ShaderStages) noexcept(false)
@@ -927,16 +886,15 @@ void PipelineStateVkImpl::InitPipelineLayout(const PipelineStateCreateInfo& Crea
     DvpValidateResourceLimits();
 #endif
 
-    // Vulkan allows only one push constant block per pipeline, but it can be accessed from multiple shader stages.
-    // Promote the first inline constant from signatures to push constants (and validate any shader-declared push constants).
-    PushConstantInfoVk PushConstant;
-    InitPushConstantInfoFromSignatures(PushConstant, ShaderStages);
+    // Create the pipeline layout - this also extracts push constant info from signatures
+    m_PipelineLayout.Create(GetDevice(), m_Signatures, m_SignatureCount);
 
-    m_PipelineLayout.Create(GetDevice(), m_Signatures, m_SignatureCount, PushConstant);
+    // Validate shader-declared push constants against the selected inline constant (if any)
+    ValidateShaderPushConstants(ShaderStages);
 
     // If we promoted an inline constant as push constant (not an existing SPIR-V push constant),
     // convert the uniform buffer to push constant in SPIRV bytecode.
-    PatchShaderConvertUniformBufferToPushConstant(PushConstant, ShaderStages);
+    PatchShaderConvertUniformBufferToPushConstant(ShaderStages);
 
     const bool RemapResources = (CreateInfo.Flags & PSO_CREATE_FLAG_DONT_REMAP_SHADER_RESOURCES) == 0;
     const bool VerifyBindings = !RemapResources && ((InternalFlags & PSO_CREATE_INTERNAL_FLAG_NO_SHADER_REFLECTION) == 0);
@@ -964,20 +922,22 @@ void PipelineStateVkImpl::InitPipelineLayout(const PipelineStateCreateInfo& Crea
     }
 }
 
-void PipelineStateVkImpl::PatchShaderConvertUniformBufferToPushConstant(const PushConstantInfoVk& PushConstantInfo,
-                                                                        TShaderStages&            ShaderStages) const noexcept(false)
+void PipelineStateVkImpl::PatchShaderConvertUniformBufferToPushConstant(TShaderStages& ShaderStages) const noexcept(false)
 {
+    const Uint32 PushConstantSignIdx = m_PipelineLayout.GetPushConstantSignatureIndex();
+    const Uint32 PushConstantResIdx  = m_PipelineLayout.GetPushConstantResourceIndex();
+
     // If no push constant was selected, no patching needed
-    if (PushConstantInfo.SignatureIndex == INVALID_PUSH_CONSTANT_INDEX ||
-        PushConstantInfo.ResourceIndex == INVALID_PUSH_CONSTANT_INDEX)
+    if (PushConstantSignIdx == INVALID_PUSH_CONSTANT_INDEX ||
+        PushConstantResIdx == INVALID_PUSH_CONSTANT_INDEX)
         return;
 
     // Get the name of the selected push constant resource
-    const PipelineResourceSignatureVkImpl* pSignature = m_Signatures[PushConstantInfo.SignatureIndex];
+    const PipelineResourceSignatureVkImpl* pSignature = m_Signatures[PushConstantSignIdx];
     if (pSignature == nullptr)
         return;
 
-    const PipelineResourceDesc& ResDesc          = pSignature->GetResourceDesc(PushConstantInfo.ResourceIndex);
+    const PipelineResourceDesc& ResDesc          = pSignature->GetResourceDesc(PushConstantResIdx);
     const std::string           PushConstantName = ResDesc.Name;
 
     // For each shader stage, check if the uniform buffer needs to be patched
