Do not serialize PRS attributes that can be computed from description

Author: TheMostDiligent

Graphics/GraphicsEngine/include/PSOSerializer.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -101,10 +101,7 @@ struct PRSSerializer
                                       ConstQual<PipelineResourceSignatureInternalDataType>& InternalData,
                                       DynamicLinearAllocator*                               Allocator)
     {
-        if (!Ser(InternalData.ShaderStages,
-                 InternalData.StaticResShaderStages,
-                 InternalData.PipelineType,
-                 InternalData.StaticResStageIndex))
+        if (!Ser(InternalData.ShaderStages))
             return false;
 
         if (!Ser.SerializeArrayRaw(Allocator, InternalData.pResourceAttribs, InternalData.NumResources))

Graphics/GraphicsEngine/include/PipelineResourceSignatureBase.hpp

@@ -104,13 +104,10 @@ void CopyPipelineResourceSignatureDesc(FixedLinearAllocator&
 template <typename PipelineResourceAttribsType, typename ImmutableSamplerAttribsType>
 struct PipelineResourceSignatureInternalData
 {
-    SHADER_TYPE                               ShaderStages          = SHADER_TYPE_UNKNOWN;
-    SHADER_TYPE                               StaticResShaderStages = SHADER_TYPE_UNKNOWN;
-    PIPELINE_TYPE                             PipelineType          = PIPELINE_TYPE_INVALID;
-    std::array<Int8, MAX_SHADERS_IN_PIPELINE> StaticResStageIndex   = {};
+    SHADER_TYPE ShaderStages = SHADER_TYPE_UNKNOWN;
 
     // The struct is used in serialization and must be tightly packed
-    Uint8 _Padding = 0;
+    Uint32 _Padding = 0;
 
     Uint32 NumResources         = 0;
     Uint32 NumImmutableSamplers = 0;
@@ -121,12 +118,9 @@ struct PipelineResourceSignatureInternalData
     constexpr bool operator==(const PipelineResourceSignatureInternalData& Rhs) const
     {
         // clang-format off
-        if (ShaderStages          != Rhs.ShaderStages ||
-            StaticResShaderStages != Rhs.StaticResShaderStages ||
-            PipelineType          != Rhs.PipelineType ||
-            StaticResStageIndex   != Rhs.StaticResStageIndex ||
-            NumResources          != Rhs.NumResources ||
-            NumImmutableSamplers  != Rhs.NumImmutableSamplers)
+        if (ShaderStages         != Rhs.ShaderStages ||
+            NumResources         != Rhs.NumResources ||
+            NumImmutableSamplers != Rhs.NumImmutableSamplers)
         // clang-format on
         {
             return false;
@@ -383,46 +377,16 @@ class PipelineResourceSignatureBase : public DeviceObjectBase<typename EngineImp
 
         ValidatePipelineResourceSignatureDesc(Desc, pDevice, EngineImplTraits::DeviceType);
 
-        // Determine shader stages that have any resources as well as
-        // shader stages that have static resources.
-        for (Uint32 i = 0; i < Desc.NumResources; ++i)
-        {
-            const PipelineResourceDesc& ResDesc = Desc.Resources[i];
-
-            m_ShaderStages |= ResDesc.ShaderStages;
-            if (ResDesc.VarType == SHADER_RESOURCE_VARIABLE_TYPE_STATIC)
-                m_StaticResShaderStages |= ResDesc.ShaderStages;
-        }
-
-        if (m_ShaderStages != SHADER_TYPE_UNKNOWN)
-        {
-            m_PipelineType = PipelineTypeFromShaderStages(m_ShaderStages);
-            DEV_CHECK_ERR(m_PipelineType != PIPELINE_TYPE_INVALID, "Failed to deduce pipeline type from shader stages");
-        }
-
-        {
-            Uint32 StaticVarStageIdx = 0;
-            for (SHADER_TYPE StaticResStages = m_StaticResShaderStages; StaticResStages != SHADER_TYPE_UNKNOWN; ++StaticVarStageIdx)
-            {
-                const SHADER_TYPE StageBit           = ExtractLSB(StaticResStages);
-                const Int32       ShaderTypeInd      = GetShaderTypePipelineIndex(StageBit, m_PipelineType);
-                m_StaticResStageIndex[ShaderTypeInd] = static_cast<Int8>(StaticVarStageIdx);
-            }
-            VERIFY_EXPR(StaticVarStageIdx == GetNumStaticResStages());
-        }
+        InitAttribs(Desc);
     }
 
     PipelineResourceSignatureBase(IReferenceCounters*                              pRefCounters,
                                   RenderDeviceImplType*                            pDevice,
                                   const PipelineResourceSignatureDesc&             Desc,
                                   const PipelineResourceSignatureInternalDataType& InternalData) :
         TDeviceObjectBase{pRefCounters, pDevice, Desc, false /*bIsDeviceInternal*/},
-        // clang-format off
-        m_ShaderStages         {InternalData.ShaderStages},
-        m_StaticResShaderStages{InternalData.StaticResShaderStages},
-        m_PipelineType         {InternalData.PipelineType},
-        m_StaticResStageIndex  {InternalData.StaticResStageIndex},
-        m_SRBMemAllocator      {GetRawAllocator()}
+        m_ShaderStages{InternalData.ShaderStages},
+        m_SRBMemAllocator{GetRawAllocator()}
     // clang-format on
     {
         // Don't read from m_Desc until it was allocated and copied in CopyPipelineResourceSignatureDesc()
@@ -433,6 +397,8 @@ class PipelineResourceSignatureBase : public DeviceObjectBase<typename EngineImp
 #ifdef DILIGENT_DEVELOPMENT
         ValidatePipelineResourceSignatureDesc(Desc, pDevice, EngineImplTraits::DeviceType);
 #endif
+
+        InitAttribs(Desc);
     }
 
     ~PipelineResourceSignatureBase()
@@ -778,10 +744,7 @@ class PipelineResourceSignatureBase : public DeviceObjectBase<typename EngineImp
     {
         PipelineResourceSignatureInternalDataType InternalData;
 
-        InternalData.ShaderStages          = m_ShaderStages;
-        InternalData.StaticResShaderStages = m_StaticResShaderStages;
-        InternalData.PipelineType          = m_PipelineType;
-        InternalData.StaticResStageIndex   = m_StaticResStageIndex;
+        InternalData.ShaderStages = m_ShaderStages;
 
         InternalData.pResourceAttribs     = m_pResourceAttribs;
         InternalData.NumResources         = this->m_Desc.NumResources;
@@ -791,6 +754,38 @@ class PipelineResourceSignatureBase : public DeviceObjectBase<typename EngineImp
         return InternalData;
     }
 
+private:
+    void InitAttribs(const PipelineResourceSignatureDesc& Desc)
+    {
+        // Determine shader stages that have any resources as well as
+        // shader stages that have static resources.
+        for (Uint32 i = 0; i < Desc.NumResources; ++i)
+        {
+            const PipelineResourceDesc& ResDesc = Desc.Resources[i];
+
+            m_ShaderStages |= ResDesc.ShaderStages;
+            if (ResDesc.VarType == SHADER_RESOURCE_VARIABLE_TYPE_STATIC)
+                m_StaticResShaderStages |= ResDesc.ShaderStages;
+        }
+
+        if (m_ShaderStages != SHADER_TYPE_UNKNOWN)
+        {
+            m_PipelineType = PipelineTypeFromShaderStages(m_ShaderStages);
+            DEV_CHECK_ERR(m_PipelineType != PIPELINE_TYPE_INVALID, "Failed to deduce pipeline type from shader stages");
+        }
+
+        {
+            Uint32 StaticVarStageIdx = 0;
+            for (SHADER_TYPE StaticResStages = m_StaticResShaderStages; StaticResStages != SHADER_TYPE_UNKNOWN; ++StaticVarStageIdx)
+            {
+                const SHADER_TYPE StageBit           = ExtractLSB(StaticResStages);
+                const Int32       ShaderTypeInd      = GetShaderTypePipelineIndex(StageBit, m_PipelineType);
+                m_StaticResStageIndex[ShaderTypeInd] = static_cast<Int8>(StaticVarStageIdx);
+            }
+            VERIFY_EXPR(StaticVarStageIdx == GetNumStaticResStages());
+        }
+    }
+
 protected:
     using AllocResourceAttribsCallbackType         = std::function<PipelineResourceAttribsType*(FixedLinearAllocator&)>;
     using AllocImmutableSamplerAttribsCallbackType = std::function<void*(FixedLinearAllocator&)>;

Graphics/GraphicsEngine/src/PipelineResourceSignatureBase.cpp

@@ -35,6 +35,14 @@
 namespace Diligent
 {
 
+namespace
+{
+
+using TestPipelineResourceSignatureInternalData = PipelineResourceSignatureInternalData<Uint32, Uint32>;
+ASSERT_SIZEOF64(TestPipelineResourceSignatureInternalData, 32, "Did you add new members to PipelineResourceSignatureInternalData? You need to implement serialization for them in PRSSerializer.");
+
+} // namespace
+
 #define LOG_PRS_ERROR_AND_THROW(...) LOG_ERROR_AND_THROW("Description of a pipeline resource signature '", (Desc.Name ? Desc.Name : ""), "' is invalid: ", ##__VA_ARGS__)
 
 void ValidatePipelineResourceSignatureDesc(const PipelineResourceSignatureDesc& Desc,

Graphics/GraphicsEngineD3D11/src/DeviceObjectArchiveD3D11.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ bool PRSSerializerD3D11<Mode>::SerializeInternalData(
     ConstQual<PipelineResourceSignatureInternalDataD3D11>& InternalData,
     DynamicLinearAllocator*                                Allocator)
 {
-    ASSERT_SIZEOF64(InternalData, 40, "Did you add a new member to PipelineResourceSignatureInternalDataD3D11? Please add serialization here.");
+    ASSERT_SIZEOF64(InternalData, 32, "Did you add a new member to PipelineResourceSignatureInternalDataD3D11? Please add serialization here.");
     return PRSSerializer<Mode>::template SerializeInternalData<PipelineResourceSignatureInternalDataD3D11>(Ser, InternalData, Allocator);
 }
 

Graphics/GraphicsEngineD3D12/src/DeviceObjectArchiveD3D12.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ bool PRSSerializerD3D12<Mode>::SerializeInternalData(
     ConstQual<PipelineResourceSignatureInternalDataD3D12>& InternalData,
     DynamicLinearAllocator*                                Allocator)
 {
-    ASSERT_SIZEOF64(InternalData, 40, "Did you add a new member to PipelineResourceSignatureInternalDataD3D12? Please add serialization here.");
+    ASSERT_SIZEOF64(InternalData, 32, "Did you add a new member to PipelineResourceSignatureInternalDataD3D12? Please add serialization here.");
     return PRSSerializer<Mode>::template SerializeInternalData<PipelineResourceSignatureInternalDataD3D12>(Ser, InternalData, Allocator);
 }
 

Graphics/GraphicsEngineOpenGL/src/DeviceObjectArchiveGL.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ bool PRSSerializerGL<Mode>::SerializeInternalData(
     ConstQual<PipelineResourceSignatureInternalDataGL>& InternalData,
     DynamicLinearAllocator*                             Allocator)
 {
-    ASSERT_SIZEOF64(InternalData, 40, "Did you add a new member to PipelineResourceSignatureInternalDataGL? Please add serialization here.");
+    ASSERT_SIZEOF64(InternalData, 32, "Did you add a new member to PipelineResourceSignatureInternalDataGL? Please add serialization here.");
     return PRSSerializer<Mode>::template SerializeInternalData<PipelineResourceSignatureInternalDataGL>(Ser, InternalData, Allocator);
 }
 

Graphics/GraphicsEngineVulkan/src/DeviceObjectArchiveVk.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ bool PRSSerializerVk<Mode>::SerializeInternalData(
     ConstQual<PipelineResourceSignatureInternalDataVk>& InternalData,
     DynamicLinearAllocator*                             Allocator)
 {
-    ASSERT_SIZEOF64(InternalData, 48, "Did you add a new member to PipelineResourceSignatureInternalDataVk? Please add serialization here.");
+    ASSERT_SIZEOF64(InternalData, 40, "Did you add a new member to PipelineResourceSignatureInternalDataVk? Please add serialization here.");
 
     if (!PRSSerializer<Mode>::template SerializeInternalData<PipelineResourceSignatureInternalDataVk>(Ser, InternalData, Allocator))
         return false;

Graphics/GraphicsEngineWebGPU/src/DeviceObjectArchiveWebGPU.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2026 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ bool PRSSerializerWebGPU<Mode>::SerializeInternalData(
     ConstQual<PipelineResourceSignatureInternalDataWebGPU>& InternalData,
     DynamicLinearAllocator*                                 Allocator)
 {
-    ASSERT_SIZEOF64(InternalData, 40, "Did you add a new member to PipelineResourceSignatureInternalDataWebGPU? Please add serialization here.");
+    ASSERT_SIZEOF64(InternalData, 32, "Did you add a new member to PipelineResourceSignatureInternalDataWebGPU? Please add serialization here.");
 
     return PRSSerializer<Mode>::template SerializeInternalData<PipelineResourceSignatureInternalDataWebGPU>(Ser, InternalData, Allocator);
 }

Tests/DiligentCoreTest/src/GraphicsEngine/PSOSerializerTest.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2025 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -132,6 +132,7 @@ struct ValueIterator
 };
 
 using TestPRSInternalData = PipelineResourceSignatureInternalData<TestResourceAttribs, TestImmutableSamplerAttribs>;
+ASSERT_SIZEOF64(TestPRSInternalData, 32, "Did you add new members to PipelineResourceSignatureInternalData? You need to implement serialization for them in PRSSerializer.");
 
 TEST(PSOSerializerTest, SerializePRSDesc)
 {
@@ -214,12 +215,7 @@ TEST(PSOSerializerTest, SerializePRSDesc)
         SrcInternalData.NumImmutableSamplers = _countof(ImmSamAttribs);
         SrcInternalData.pImmutableSamplers   = ImmSamAttribs;
 
-        SrcInternalData.ShaderStages          = Val(SHADER_TYPE_GEOMETRY, (SHADER_TYPE_LAST << 1) - 1);
-        SrcInternalData.StaticResShaderStages = Val(SHADER_TYPE_HULL, (SHADER_TYPE_LAST << 1) - 1);
-        SrcInternalData.PipelineType          = Val(PIPELINE_TYPE_GRAPHICS, PIPELINE_TYPE_LAST);
-
-        for (size_t i = 0; i < SrcInternalData.StaticResStageIndex.size(); ++i)
-            SrcInternalData.StaticResStageIndex[i] = Val(static_cast<Int8>(i), Int8{127});
+        SrcInternalData.ShaderStages = Val(SHADER_TYPE_GEOMETRY, (SHADER_TYPE_LAST << 1) - 1);
 
         DynamicLinearAllocator Allocator{GetRawAllocator()};
         SerializedData         Data;