PipelineResourceSignatureBase: add CreateInlineConstantBuffer method

Author: TheMostDiligent

Graphics/GraphicsEngine/include/PipelineResourceSignatureBase.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2025 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -343,6 +343,9 @@ class PipelineResourceSignatureBase : public DeviceObjectBase<typename EngineImp
     // Sampler implementation type (SamplerD3D12Impl, SamplerVkImpl, etc.)
     using SamplerImplType = typename EngineImplTraits::SamplerImplType;
 
+    // Buffer implementation type (BufferD3D12Impl, BufferVkImpl, etc.)
+    using BufferImplType = typename EngineImplTraits::BufferImplType;
+
     // Pipeline resource signature implementation type (PipelineResourceSignatureD3D12Impl, PipelineResourceSignatureVkImpl, etc.)
     using PipelineResourceSignatureImplType = typename EngineImplTraits::PipelineResourceSignatureImplType;
 
@@ -1061,6 +1064,22 @@ class PipelineResourceSignatureBase : public DeviceObjectBase<typename EngineImp
         }
     }
 
+    RefCntAutoPtr<BufferImplType> CreateInlineConstantBuffer(const char* ResName, Uint32 NumConstants) const
+    {
+        RefCntAutoPtr<IBuffer> pBuffer;
+        if (this->m_pDevice)
+        {
+            std::string Name = this->m_Desc.Name;
+            Name += " - ";
+            Name += ResName;
+            BufferDesc CBDesc{Name.c_str(), NumConstants * sizeof(Uint32), BIND_UNIFORM_BUFFER, USAGE_DYNAMIC, CPU_ACCESS_WRITE};
+
+            this->m_pDevice->CreateBuffer(CBDesc, nullptr, &pBuffer);
+            VERIFY_EXPR(pBuffer);
+        }
+        return RefCntAutoPtr<BufferImplType>{pBuffer.RawPtr<BufferImplType>()};
+    }
+
 protected:
     std::unique_ptr<void, STDDeleterRawMem<void>> m_pRawMemory;
 

Graphics/GraphicsEngineD3D11/src/PipelineResourceSignatureD3D11Impl.cpp

@@ -261,18 +261,7 @@ void PipelineResourceSignatureD3D11Impl::CreateLayout(const bool IsSerialized)
                 // which will allow skipping buffer update if the inline constants are not changed.
                 // However, this will increase memory consumption as each SRB will have its own copy of the inline CB.
                 // Besides, inline constants are expected to change frequently, so skipping updates is unlikely.
-                if (m_pDevice)
-                {
-                    std::string Name = m_Desc.Name;
-                    Name += " - ";
-                    Name += ResDesc.Name;
-                    BufferDesc CBDesc{Name.c_str(), ResDesc.ArraySize * sizeof(Uint32), BIND_UNIFORM_BUFFER, USAGE_DYNAMIC, CPU_ACCESS_WRITE};
-
-                    RefCntAutoPtr<IBuffer> pBuffer;
-                    m_pDevice->CreateBuffer(CBDesc, nullptr, &pBuffer);
-                    VERIFY_EXPR(pBuffer);
-                    InlineCBAttribs.pBuffer = pBuffer.RawPtr<BufferD3D11Impl>();
-                }
+                InlineCBAttribs.pBuffer = CreateInlineConstantBuffer(ResDesc.Name, ResDesc.ArraySize);
             }
         }
         else

Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp

@@ -210,8 +210,9 @@ void PipelineResourceSignatureVkImpl::CreateSetLayouts(const bool IsSerialized)
     }
 
     // Initialize static resource cache (now that we know the inline constant size)
-    if (GetNumStaticResStages() > 0 && StaticResourceCount > 0)
+    if (StaticResourceCount > 0)
     {
+        VERIFY_EXPR(GetNumStaticResStages() > 0);
         m_pStaticResCache->InitializeSets(GetRawAllocator(), 1, &StaticResourceCount, TotalStaticInlineConstants);
     }
 
@@ -403,26 +404,10 @@ void PipelineResourceSignatureVkImpl::CreateSetLayouts(const bool IsSerialized)
             InlineCBAttribs.BindingIndex                   = pAttribs->BindingIndex;
             InlineCBAttribs.NumConstants                   = ResDesc.ArraySize; // For inline constants, ArraySize is the number of 32-bit constants
 
-            // Create a shared buffer in the Signature for all inline constants
+            // Create a shared buffer in the Signature for all inline constants.
             // All SRBs will reference this same buffer (similar to D3D11 backend)
-            // Push constant selection is handled at PSO creation time
-            if (m_pDevice)
-            {
-                std::string Name = m_Desc.Name;
-                Name += " - ";
-                Name += ResDesc.Name;
-                BufferDesc CBDesc;
-                CBDesc.Name           = Name.c_str();
-                CBDesc.Size           = ResDesc.ArraySize * sizeof(Uint32);
-                CBDesc.Usage          = USAGE_DYNAMIC;
-                CBDesc.BindFlags      = BIND_UNIFORM_BUFFER;
-                CBDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
-
-                RefCntAutoPtr<IBuffer> pBuffer;
-                m_pDevice->CreateBuffer(CBDesc, nullptr, &pBuffer);
-                VERIFY_EXPR(pBuffer);
-                InlineCBAttribs.pBuffer = RefCntAutoPtr<BufferVkImpl>{pBuffer, IID_BufferVk};
-            }
+            // Push constant selection is handled at PSO creation time.
+            InlineCBAttribs.pBuffer = CreateInlineConstantBuffer(ResDesc.Name, ResDesc.ArraySize);
         }
     }
     VERIFY_EXPR(InlineConstantBufferIdx == m_NumInlineConstantBufferAttribs);
@@ -577,14 +562,7 @@ void PipelineResourceSignatureVkImpl::Destruct()
 
     // Release shared inline constant buffers before base class Destruct
     // Each InlineConstantBufferAttribsVk::pBuffer holds a RefCntAutoPtr to the shared buffer
-    if (m_InlineConstantBufferAttribs)
-    {
-        for (Uint32 i = 0; i < m_NumInlineConstantBufferAttribs; ++i)
-        {
-            m_InlineConstantBufferAttribs[i].pBuffer.Release();
-        }
-        m_InlineConstantBufferAttribs.reset();
-    }
+    m_InlineConstantBufferAttribs.reset();
     m_NumInlineConstantBufferAttribs = 0;
 
     TPipelineResourceSignatureBase::Destruct();