SPIRVShaderResources: add Create method

Author: TheMostDiligent

Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp

@@ -235,29 +235,17 @@ void ShaderVkImpl::Initialize(const ShaderCreateInfo& ShaderCI,
     {
         if ((ShaderCI.CompileFlags & SHADER_COMPILE_FLAG_SKIP_REFLECTION) == 0)
         {
-            IMemoryAllocator& Allocator = GetRawAllocator();
-
-            std::unique_ptr<void, STDDeleterRawMem<void>> pRawMem{
-                ALLOCATE(Allocator, "Memory for SPIRVShaderResources", SPIRVShaderResources, 1),
-                STDDeleterRawMem<void>(Allocator),
-            };
-
             SPIRVShaderResources::CreateInfo ResCI;
             ResCI.ShaderType                  = m_Desc.ShaderType;
             ResCI.Name                        = m_Desc.Name;
             ResCI.CombinedSamplerSuffix       = m_Desc.UseCombinedTextureSamplers ? m_Desc.CombinedSamplerSuffix : nullptr;
             ResCI.LoadShaderStageInputs       = m_Desc.ShaderType == SHADER_TYPE_VERTEX;
             ResCI.LoadUniformBufferReflection = ShaderCI.LoadConstantBufferReflection;
-            new (pRawMem.get()) SPIRVShaderResources // May throw
-                {
-                    Allocator,
-                    m_SPIRV,
-                    ResCI,
-                    m_EntryPoint,
-                };
+
+            m_pShaderResources = SPIRVShaderResources::Create(GetRawAllocator(), m_SPIRV, ResCI, &m_EntryPoint);
+
             VERIFY_EXPR(ShaderCI.ByteCode != nullptr || m_EntryPoint == ShaderCI.EntryPoint ||
                         (m_EntryPoint == "main" && (ShaderCI.CompileFlags & SHADER_COMPILE_FLAG_HLSL_TO_SPIRV_VIA_GLSL) != 0));
-            m_pShaderResources.reset(static_cast<SPIRVShaderResources*>(pRawMem.release()), STDDeleterRawMem<SPIRVShaderResources>(Allocator));
 
             if (ResCI.LoadShaderStageInputs && m_pShaderResources->IsHLSLSource())
             {

Graphics/GraphicsEngineWebGPU/src/ShaderWebGPUImpl.cpp

@@ -69,8 +69,6 @@ std::vector<uint32_t> CompileShaderToSPIRV(const ShaderCreateInfo&             S
     {
         SPIRV = GLSLangUtils::HLSLtoSPIRV(ShaderCI, GLSLangUtils::SpirvVersion::Vk100, WebGPUDefine, WebGPUShaderCI.ppCompilerOutput);
 
-        std::string EntryPoint;
-
         SPIRVShaderResources::CreateInfo ResCI;
         ResCI.ShaderType                  = ShaderCI.Desc.ShaderType;
         ResCI.Name                        = ShaderCI.Desc.Name;
@@ -82,7 +80,6 @@ std::vector<uint32_t> CompileShaderToSPIRV(const ShaderCreateInfo&             S
             GetRawAllocator(),
             SPIRV,
             ResCI,
-            EntryPoint,
         };
 
         if (ShaderCI.Desc.ShaderType == SHADER_TYPE_VERTEX)

Graphics/ShaderTools/include/SPIRVShaderResources.hpp

@@ -207,7 +207,13 @@ class SPIRVShaderResources
     SPIRVShaderResources(IMemoryAllocator&     Allocator,
                          std::vector<uint32_t> spirv_binary,
                          const CreateInfo&     CI,
-                         std::string&          EntryPoint) noexcept(false);
+                         std::string*          pEntryPoint = nullptr) noexcept(false);
+
+    static std::shared_ptr<const SPIRVShaderResources> Create(
+        IMemoryAllocator&     Allocator,
+        std::vector<uint32_t> spirv_binary,
+        const CreateInfo&     CI,
+        std::string*          pEntryPoint = nullptr) noexcept(false);
 
     // clang-format off
     SPIRVShaderResources             (const SPIRVShaderResources&)  = delete;
@@ -390,9 +396,10 @@ class SPIRVShaderResources
 
     // clang-format off
 
-    const char* GetCombinedSamplerSuffix() const { return m_CombinedSamplerSuffix; }
-    const char* GetShaderName()            const { return m_ShaderName; }
-    bool        IsUsingCombinedSamplers()  const { return m_CombinedSamplerSuffix != nullptr; }
+    const char* GetCombinedSamplerSuffix()   const { return m_CombinedSamplerSuffix; }
+    const char* GetShaderName()              const { return m_ShaderName; }
+    bool        IsUsingCombinedSamplers()    const { return m_CombinedSamplerSuffix != nullptr; }
+    bool        HasUniformBufferReflection() const { return m_UBReflectionBuffer != nullptr; }
 
     // clang-format on
 

Graphics/ShaderTools/src/SPIRVShaderResources.cpp

@@ -472,7 +472,7 @@ ShaderCodeBufferDescX LoadUBReflection(const diligent_spirv_cross::Compiler& Com
 SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator&     Allocator,
                                            std::vector<uint32_t> spirv_binary,
                                            const CreateInfo&     CI,
-                                           std::string&          EntryPoint) noexcept(false) :
+                                           std::string*          pEntryPoint) noexcept(false) :
     m_ShaderType{CI.ShaderType}
 {
     // https://github.com/KhronosGroup/SPIRV-Cross/wiki/Reflection-API-user-guide
@@ -483,6 +483,9 @@ SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator&     Allocator,
     m_IsHLSLSource = ParsedIRSource.hlsl;
     diligent_spirv_cross::Compiler Compiler{std::move(parser.get_parsed_ir())};
 
+    std::string  EntryPointLocal;
+    std::string& EntryPoint = pEntryPoint != nullptr ? *pEntryPoint : EntryPointLocal;
+
     spv::ExecutionModel ExecutionModel = ShaderTypeToSpvExecutionModel(m_ShaderType);
     auto                EntryPoints    = Compiler.get_entry_points_and_stages();
     for (const diligent_spirv_cross::EntryPoint& CurrEntryPoint : EntryPoints)
@@ -1117,4 +1120,30 @@ std::string SPIRVShaderResources::DumpResources() const
     return ss.str();
 }
 
+
+std::shared_ptr<const SPIRVShaderResources> SPIRVShaderResources::Create(
+    IMemoryAllocator&     Allocator,
+    std::vector<uint32_t> spirv_binary,
+    const CreateInfo&     CI,
+    std::string*          pEntryPoint) noexcept(false)
+{
+    std::unique_ptr<void, STDDeleterRawMem<void>> pRawMem{
+        ALLOCATE(Allocator, "Memory for SPIRVShaderResources", SPIRVShaderResources, 1),
+        STDDeleterRawMem<void>(Allocator),
+    };
+
+    new (pRawMem.get()) SPIRVShaderResources // May throw
+        {
+            Allocator,
+            std::move(spirv_binary),
+            CI,
+            pEntryPoint,
+        };
+
+    return {
+        static_cast<SPIRVShaderResources*>(pRawMem.release()),
+        STDDeleterRawMem<SPIRVShaderResources>(Allocator),
+    };
+}
+
 } // namespace Diligent

Tests/DiligentCoreTest/src/ShaderTools/SPIRVShaderResourcesTest.cpp

@@ -211,13 +211,10 @@ void TestSPIRVResources(const char*
     SPIRVShaderResources::CreateInfo ResCI;
     ResCI.ShaderType = ShaderType;
     ResCI.Name       = "SPIRVResources test";
-
-    std::string          EntryPoint;
     SPIRVShaderResources Resources{
         GetRawAllocator(),
         SPIRV,
         ResCI,
-        EntryPoint,
     };
 
     LOG_INFO_MESSAGE("SPIRV Resources:\n", Resources.DumpResources());