Updated serialization of the ShaderCreateInfo struct

DiligentGraphics · Apr 19, 2024 · 02fa0a0 · 02fa0a0
1 parent 08fca45
commit 02fa0a0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/Graphics/GraphicsEngine/include/DeviceObjectArchive.hpp b/Graphics/GraphicsEngine/include/DeviceObjectArchive.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2024 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.
@@ -127,7 +127,7 @@ class DeviceObjectArchive
     };
 
     static constexpr Uint32 HeaderMagicNumber = 0xDE00000A;
-    static constexpr Uint32 ArchiveVersion    = 6;
+    static constexpr Uint32 ArchiveVersion    = 7;
 
     struct ArchiveHeader
     {

diff --git a/Graphics/GraphicsEngine/include/PSOSerializer.hpp b/Graphics/GraphicsEngine/include/PSOSerializer.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2024 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.
@@ -131,5 +131,6 @@ DECL_TRIVIALLY_SERIALIZABLE(RasterizerStateDesc);
 DECL_TRIVIALLY_SERIALIZABLE(DepthStencilStateDesc);
 DECL_TRIVIALLY_SERIALIZABLE(SampleDesc);
 DECL_TRIVIALLY_SERIALIZABLE(ShaderCreateInfo);
+DECL_TRIVIALLY_SERIALIZABLE(Version);
 
 } // namespace Diligent
diff --git a/Graphics/GraphicsEngine/src/PSOSerializer.cpp b/Graphics/GraphicsEngine/src/PSOSerializer.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2024 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.
@@ -507,10 +507,19 @@ bool ShaderSerializer<Mode>::SerializeCI(Serializer<Mode>&            Ser,
              CI.Desc.CombinedSamplerSuffix,
              CI.EntryPoint,
              CI.SourceLanguage,
-             CI.ShaderCompiler))
+             CI.ShaderCompiler,
+             CI.HLSLVersion,
+             CI.GLSLVersion,
+             CI.GLESSLVersion,
+             CI.MSLVersion,
+             CI.CompileFlags,
+             CI.LoadConstantBufferReflection,
+             CI.GLSLExtensions))
         return false;
 
     return SerializeBytecodeOrSource(Ser, CI);
+
+    ASSERT_SIZEOF64(ShaderCreateInfo, 144, "Did you add a new member to ShaderCreateInfo? Please add serialization here.");
 }
 
 template struct PSOSerializer<SerializerMode::Read>;

diff --git a/Graphics/ShaderTools/src/GLSLUtils.cpp b/Graphics/ShaderTools/src/GLSLUtils.cpp
@@ -60,7 +60,7 @@ String BuildGLSLSourceString(const ShaderCreateInfo&      ShaderCI,
 
     auto AppendGLSLExtensions = [&GLSLSource, &ShaderCI]() //
     {
-        if (ShaderCI.GLSLExtensions != nullptr)
+        if (ShaderCI.GLSLExtensions != nullptr && ShaderCI.GLSLExtensions[0] != '\0')
         {
             GLSLSource.append(ShaderCI.GLSLExtensions);
             GLSLSource.push_back('\n');

diff --git a/Tests/DiligentCoreTest/src/GraphicsEngine/PSOSerializerTest.cpp b/Tests/DiligentCoreTest/src/GraphicsEngine/PSOSerializerTest.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2024 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.
@@ -701,10 +701,17 @@ TEST(PSOSerializerTest, SerializeRenderPassDesc)
 void SerializeShaderCreateInfo(bool UseBytecode)
 {
     ShaderCreateInfo RefCI;
-    RefCI.Desc           = {"Serialized Shader", SHADER_TYPE_COMPUTE, true, "suff"};
-    RefCI.EntryPoint     = "Entry_Point";
-    RefCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
-    RefCI.ShaderCompiler = SHADER_COMPILER_GLSLANG;
+    RefCI.Desc                         = {"Serialized Shader", SHADER_TYPE_COMPUTE, true, "suff"};
+    RefCI.EntryPoint                   = "Entry_Point";
+    RefCI.SourceLanguage               = SHADER_SOURCE_LANGUAGE_HLSL;
+    RefCI.ShaderCompiler               = SHADER_COMPILER_GLSLANG;
+    RefCI.HLSLVersion                  = {1, 2};
+    RefCI.GLSLVersion                  = {3, 4};
+    RefCI.GLESSLVersion                = {5, 6};
+    RefCI.MSLVersion                   = {7, 8};
+    RefCI.CompileFlags                 = SHADER_COMPILE_FLAG_SKIP_REFLECTION;
+    RefCI.LoadConstantBufferReflection = true;
+    RefCI.GLSLExtensions               = "My extension";
 
     constexpr size_t RefBytecodeSize              = 7;
     const Uint8      RefBytecode[RefBytecodeSize] = {42, 13, 179, 211, 97, 65, 71};