Complete 4. **Create-info lifetime, copy, and serialization**: Extend PipelineStateCreateInfoX, Extend PSO serialization/deserialization, Add tests to TestSerializePSOCreateInfo.

Author: hzqst

Graphics/GraphicsEngine/interface/GraphicsTypesX.hpp

@@ -1236,6 +1236,8 @@ struct PipelineStateCreateInfoX : CreateInfoType
             AddSignature(CI.ppResourceSignatures[i]);
         if (CI.pPSOCache != nullptr)
             SetPipelineStateCache(CI.pPSOCache);
+        for (Uint32 i = 0; i < CI.NumSpecializationConstants; ++i)
+            AddSpecializationConstant(CI.pSpecializationConstants[i]);
         this->PSODesc.ResourceLayout = ResourceLayout;
         this->pInternalData          = InternalData.get();
     }
@@ -1356,6 +1358,44 @@ struct PipelineStateCreateInfoX : CreateInfoType
         return static_cast<DerivedType&>(*this);
     }
 
+    DerivedType& AddSpecializationConstant(const SpecializationConstant& SpecConst)
+    {
+        SpecConstCopy.push_back(SpecConst);
+        auto& Entry = SpecConstCopy.back();
+
+        // Deep-copy name
+        if (SpecConst.Name != nullptr)
+            Entry.Name = StringPool.emplace(SpecConst.Name).first->c_str();
+
+        // Deep-copy data
+        if (SpecConst.Size > 0 && SpecConst.pData != nullptr)
+        {
+            const auto* pSrcData = static_cast<const Uint8*>(SpecConst.pData);
+            SpecConstDataCopy.emplace_back(pSrcData, pSrcData + SpecConst.Size);
+            Entry.pData = SpecConstDataCopy.back().data();
+        }
+        else
+        {
+            SpecConstDataCopy.emplace_back();
+            Entry.pData = nullptr;
+        }
+
+        this->pSpecializationConstants    = SpecConstCopy.data();
+        this->NumSpecializationConstants = static_cast<Uint32>(SpecConstCopy.size());
+
+        return static_cast<DerivedType&>(*this);
+    }
+
+    DerivedType& ClearSpecializationConstants()
+    {
+        SpecConstCopy.clear();
+        SpecConstDataCopy.clear();
+        this->pSpecializationConstants    = nullptr;
+        this->NumSpecializationConstants = 0;
+
+        return static_cast<DerivedType&>(*this);
+    }
+
 protected:
     DerivedType& SetShader(IShader*& pDstShader, IShader* pShader)
     {
@@ -1389,6 +1429,8 @@ struct PipelineStateCreateInfoX : CreateInfoType
     std::vector<RefCntAutoPtr<IDeviceObject>> Objects;
     std::vector<IPipelineResourceSignature*>  Signatures;
     std::unique_ptr<Uint8[]>                  InternalData;
+    std::vector<SpecializationConstant>       SpecConstCopy;
+    std::vector<std::vector<Uint8>>           SpecConstDataCopy;
 };
 
 

Tests/DiligentCoreTest/src/GraphicsEngine/PSOSerializerTest.cpp

@@ -271,6 +271,21 @@ static void TestSerializePSOCreateInfo(HelperType&& Helper)
         for (Uint32 i = 0; i < SrcPSO.ResourceSignaturesCount; ++i)
             SrcPRSNames[i] = PRSNames[i].c_str();
 
+        const Uint32 SpecConstData0 = 0x12345678u;
+        const float  SpecConstData1 = 3.14f;
+        const Uint32 SpecConstData2 = 42u;
+
+        SpecializationConstant SpecConsts[] =
+            {
+                {"ConstA", SHADER_TYPE_VERTEX, sizeof(SpecConstData0), &SpecConstData0},
+                {"ConstB", SHADER_TYPE_PIXEL, sizeof(SpecConstData1), &SpecConstData1},
+                {"ConstC", SHADER_TYPE_GEOMETRY, sizeof(SpecConstData2), &SpecConstData2} //
+            };
+
+        SrcPSO.NumSpecializationConstants = Val(0u, _countof(SpecConsts));
+        if (SrcPSO.NumSpecializationConstants > 0)
+            SrcPSO.pSpecializationConstants = SpecConsts;
+
         Helper.Init(SrcPSO, Val);
 
         Serializer<SerializerMode::Measure> MSer;