IShaderResourceVariable: add SetInlineConstants method plumbing (#672)

TheMostDiligent · TheMostDiligent · commit 0c612092abc9 · 2025-10-19T16:29:17.000-07:00
diff --git a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp
@@ -713,6 +713,21 @@ struct ShaderVariableBase : public ResourceVariableBaseInterface
     }
 
 
+    virtual void DILIGENT_CALL_TYPE SetInlineConstants(const void* pConstants,
+                                                       Uint32      FirstConstant,
+                                                       Uint32      NumConstants) override final
+    {
+#ifdef DILIGENT_DEVELOPMENT
+        {
+            const PipelineResourceDesc& Desc = GetDesc();
+            DEV_CHECK_ERR(Desc.ResourceType == SHADER_RESOURCE_TYPE_INLINE_CONSTANTS,
+                          "SetInlineConstants() is only allowed for inline constant variables.");
+        }
+#endif
+
+        static_cast<ThisImplType*>(this)->SetConstants(pConstants, FirstConstant, NumConstants);
+    }
+
     virtual SHADER_RESOURCE_VARIABLE_TYPE DILIGENT_CALL_TYPE GetType() const override final
     {
         return GetDesc().VarType;
diff --git a/Graphics/GraphicsEngine/interface/ShaderResourceVariable.h b/Graphics/GraphicsEngine/interface/ShaderResourceVariable.h
@@ -250,6 +250,17 @@ DILIGENT_BEGIN_INTERFACE(IShaderResourceVariable, IObject)
                                          Uint32 ArrayIndex DEFAULT_VALUE(0)) PURE;
 
 
+    /// For inline constant variables, sets the constant values
+
+    /// \param [in] pConstants    - pointer to the array of 32-bit constant values.
+    /// \param [in] FirstConstant - index of the first 32-bit constant to set.
+    /// \param [in] NumConstants  - number of 32-bit constants to set.
+    VIRTUAL void METHOD(SetInlineConstants)(THIS_
+                                            const void* pConstants,
+                                            Uint32      FirstConstant,
+                                            Uint32      NumConstants) PURE;
+
+
     /// Returns the shader resource variable type
     VIRTUAL SHADER_RESOURCE_VARIABLE_TYPE METHOD(GetType)(THIS) CONST PURE;
 
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderVariableManagerD3D11.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderVariableManagerD3D11.hpp
@@ -130,6 +130,11 @@ class ShaderVariableManagerD3D11 : ShaderVariableManagerBase<EngineD3D11ImplTrai
         {
             UNSUPPORTED("Dynamic offset may only be set for constant buffers.");
         }
+
+        void SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants)
+        {
+            UNSUPPORTED("Inline constants may only be set for constant buffers.");
+        }
     };
 
     struct ConstBuffBindInfo final : ShaderVariableD3D11Base<ConstBuffBindInfo, D3D11_RESOURCE_RANGE_CBV>
@@ -141,6 +146,8 @@ class ShaderVariableManagerD3D11 : ShaderVariableManagerBase<EngineD3D11ImplTrai
         void BindResource(const BindResourceInfo& BindInfo);
 
         void SetDynamicOffset(Uint32 ArrayIndex, Uint32 Offset);
+
+        void SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants);
     };
 
     struct TexSRVBindInfo final : ShaderVariableD3D11Base<TexSRVBindInfo, D3D11_RESOURCE_RANGE_SRV>
diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderVariableManagerD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderVariableManagerD3D11.cpp
@@ -306,6 +306,11 @@ void ShaderVariableManagerD3D11::ConstBuffBindInfo::SetDynamicOffset(Uint32 Arra
     m_ParentManager.m_ResourceCache.SetDynamicCBOffset(Attr.BindPoints + ArrayIndex, Offset);
 }
 
+void ShaderVariableManagerD3D11::ConstBuffBindInfo::SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants)
+{
+    UNSUPPORTED("Not yet implemented");
+}
+
 void ShaderVariableManagerD3D11::TexSRVBindInfo::BindResource(const BindResourceInfo& BindInfo)
 {
     const PipelineResourceDesc&         Desc = GetDesc();
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderVariableManagerD3D12.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderVariableManagerD3D12.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -104,6 +104,11 @@ class ShaderVariableManagerD3D12 : public ShaderVariableManagerBase<EngineD3D12I
                                 Uint32 ArrayIndex,
                                 Uint32 BufferDynamicOffset);
 
+    void SetInlineConstants(Uint32      ResIndex,
+                            const void* pConstants,
+                            Uint32      FirstConstant,
+                            Uint32      NumConstants);
+
     IDeviceObject* Get(Uint32 ArrayIndex,
                        Uint32 ResIndex) const;
 
@@ -192,6 +197,13 @@ class ShaderVariableD3D12Impl final : public ShaderVariableBase<ShaderVariableD3
         m_ParentManager.SetBufferDynamicOffset(m_ResIndex, ArrayIndex, BufferRangeOffset);
     }
 
+    void SetConstants(const void* pConstants,
+                      Uint32      FirstConstant,
+                      Uint32      NumConstants)
+    {
+        m_ParentManager.SetInlineConstants(m_ResIndex, pConstants, FirstConstant, NumConstants);
+    }
+
 private:
     using ResourceAttribs = PipelineResourceAttribsD3D12;
     const ResourceAttribs& GetAttribs() const
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp
@@ -673,6 +673,14 @@ void ShaderVariableManagerD3D12::SetBufferDynamicOffset(Uint32 ResIndex,
     m_ResourceCache.SetBufferDynamicOffset(RootIndex, OffsetFromTableStart, BufferDynamicOffset);
 }
 
+void ShaderVariableManagerD3D12::SetInlineConstants(Uint32      ResIndex,
+                                                    const void* pConstants,
+                                                    Uint32      FirstConstant,
+                                                    Uint32      NumConstants)
+{
+    UNSUPPORTED("Not implemented yet");
+}
+
 IDeviceObject* ShaderVariableManagerD3D12::Get(Uint32 ArrayIndex,
                                                Uint32 ResIndex) const
 {
diff --git a/Graphics/GraphicsEngineOpenGL/include/ShaderVariableManagerGL.hpp b/Graphics/GraphicsEngineOpenGL/include/ShaderVariableManagerGL.hpp
@@ -114,6 +114,11 @@ class ShaderVariableManagerGL : ShaderVariableManagerBase<EngineGLImplTraits, vo
         {
             UNSUPPORTED("Dynamic offset may only be set for uniform and storage buffers");
         }
+
+        void SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants)
+        {
+            UNSUPPORTED("Inline constants may only be set for uniform buffers");
+        }
     };
 
 
@@ -133,6 +138,8 @@ class ShaderVariableManagerGL : ShaderVariableManagerBase<EngineGLImplTraits, vo
         }
 
         void SetDynamicOffset(Uint32 ArrayIndex, Uint32 Offset);
+
+        void SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants);
     };
 
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/ShaderVariableManagerGL.cpp b/Graphics/GraphicsEngineOpenGL/src/ShaderVariableManagerGL.cpp
@@ -223,6 +223,10 @@ void ShaderVariableManagerGL::UniformBuffBindInfo::SetDynamicOffset(Uint32 Array
     m_ParentManager.m_ResourceCache.SetDynamicUBOffset(Attr.CacheOffset + ArrayIndex, Offset);
 }
 
+void ShaderVariableManagerGL::UniformBuffBindInfo::SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants)
+{
+    UNSUPPORTED("Not yet implemented");
+}
 
 void ShaderVariableManagerGL::TextureBindInfo::BindResource(const BindResourceInfo& BindInfo)
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderVariableManagerVk.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderVariableManagerVk.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -98,6 +98,11 @@ class ShaderVariableManagerVk : ShaderVariableManagerBase<EngineVkImplTraits, Sh
                                 Uint32 ArrayIndex,
                                 Uint32 BufferDynamicOffset);
 
+    void SetInlineConstants(Uint32      ResIndex,
+                            const void* pConstants,
+                            Uint32      FirstConstant,
+                            Uint32      NumConstants);
+
     IDeviceObject* Get(Uint32 ArrayIndex,
                        Uint32 ResIndex) const;
 
@@ -167,6 +172,13 @@ class ShaderVariableVkImpl final : public ShaderVariableBase<ShaderVariableVkImp
     {
         m_ParentManager.SetBufferDynamicOffset(m_ResIndex, ArrayIndex, BufferDynamicOffset);
     }
+
+    void SetConstants(const void* pConstants,
+                      Uint32      FirstConstant,
+                      Uint32      NumConstants)
+    {
+        m_ParentManager.SetInlineConstants(m_ResIndex, pConstants, FirstConstant, NumConstants);
+    }
 };
 
 } // namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderVariableManagerVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderVariableManagerVk.cpp
@@ -650,6 +650,14 @@ void ShaderVariableManagerVk::SetBufferDynamicOffset(Uint32 ResIndex,
     m_ResourceCache.SetDynamicBufferOffset(Attribs.DescrSet, DstResCacheOffset, BufferDynamicOffset);
 }
 
+void ShaderVariableManagerVk::SetInlineConstants(Uint32      ResIndex,
+                                                 const void* pConstants,
+                                                 Uint32      FirstConstant,
+                                                 Uint32      NumConstants)
+{
+    UNSUPPORTED("Not yet implemented");
+}
+
 IDeviceObject* ShaderVariableManagerVk::Get(Uint32 ArrayIndex, Uint32 ResIndex) const
 {
     const PipelineResourceDesc&      ResDesc     = GetResourceDesc(ResIndex);
diff --git a/Graphics/GraphicsEngineWebGPU/include/ShaderVariableManagerWebGPU.hpp b/Graphics/GraphicsEngineWebGPU/include/ShaderVariableManagerWebGPU.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023-2024 Diligent Graphics LLC
+ *  Copyright 2023-2025 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.
@@ -65,6 +65,11 @@ class ShaderVariableManagerWebGPU : ShaderVariableManagerBase<EngineWebGPUImplTr
                                 Uint32 ArrayIndex,
                                 Uint32 BufferDynamicOffset);
 
+    void SetInlineConstants(Uint32      ResIndex,
+                            const void* pConstants,
+                            Uint32      FirstConstant,
+                            Uint32      NumConstants);
+
     IDeviceObject* Get(Uint32 ArrayIndex,
                        Uint32 ResIndex) const;
 
@@ -133,6 +138,13 @@ class ShaderVariableWebGPUImpl final : public ShaderVariableBase<ShaderVariableW
     {
         m_ParentManager.SetBufferDynamicOffset(m_ResIndex, ArrayIndex, BufferDynamicOffset);
     }
+
+    void SetConstants(const void* pConstants,
+                      Uint32      FirstConstant,
+                      Uint32      NumConstants)
+    {
+        m_ParentManager.SetInlineConstants(m_ResIndex, pConstants, FirstConstant, NumConstants);
+    }
 };
 
 } // namespace Diligent
diff --git a/Graphics/GraphicsEngineWebGPU/src/ShaderVariableManagerWebGPU.cpp b/Graphics/GraphicsEngineWebGPU/src/ShaderVariableManagerWebGPU.cpp
@@ -529,6 +529,13 @@ void ShaderVariableManagerWebGPU::SetBufferDynamicOffset(Uint32 ResIndex,
     m_ResourceCache.SetDynamicBufferOffset(Attribs.BindGroup, DstResCacheOffset, BufferDynamicOffset);
 }
 
+void ShaderVariableManagerWebGPU::SetInlineConstants(Uint32      ResIndex,
+                                                     const void* pConstants,
+                                                     Uint32      FirstConstant,
+                                                     Uint32      NumConstants)
+{
+    UNSUPPORTED("Not implemented yet");
+}
 
 IDeviceObject* ShaderVariableManagerWebGPU::Get(Uint32 ArrayIndex, Uint32 ResIndex) const
 {

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,11 @@ void ShaderVariableManagerD3D11::ConstBuffBindInfo::SetDynamicOffset(Uint32 Arra`
`306`	`306`	`m_ParentManager.m_ResourceCache.SetDynamicCBOffset(Attr.BindPoints + ArrayIndex, Offset);`
`307`	`307`	`}`
`308`	`308`
	`309`	`+void ShaderVariableManagerD3D11::ConstBuffBindInfo::SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants)`
	`310`	`+{`
	`311`	`+ UNSUPPORTED("Not yet implemented");`
	`312`	`+}`
	`313`	`+`
`309`	`314`	`void ShaderVariableManagerD3D11::TexSRVBindInfo::BindResource(const BindResourceInfo& BindInfo)`
`310`	`315`	`{`
`311`	`316`	`const PipelineResourceDesc& Desc = GetDesc();`
Original file line number	Diff line number	Diff line change
`@@ -673,6 +673,14 @@ void ShaderVariableManagerD3D12::SetBufferDynamicOffset(Uint32 ResIndex,`
`673`	`673`	`m_ResourceCache.SetBufferDynamicOffset(RootIndex, OffsetFromTableStart, BufferDynamicOffset);`
`674`	`674`	`}`
`675`	`675`
	`676`	`+void ShaderVariableManagerD3D12::SetInlineConstants(Uint32 ResIndex,`
	`677`	`+ const void* pConstants,`
	`678`	`+ Uint32 FirstConstant,`
	`679`	`+ Uint32 NumConstants)`
	`680`	`+{`
	`681`	`+ UNSUPPORTED("Not implemented yet");`
	`682`	`+}`
	`683`	`+`
`676`	`684`	`IDeviceObject* ShaderVariableManagerD3D12::Get(Uint32 ArrayIndex,`
`677`	`685`	`Uint32 ResIndex) const`
`678`	`686`	`{`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,11 @@ class ShaderVariableManagerGL : ShaderVariableManagerBase<EngineGLImplTraits, vo`
`114`	`114`	`{`
`115`	`115`	`UNSUPPORTED("Dynamic offset may only be set for uniform and storage buffers");`
`116`	`116`	`}`
	`117`	`+`
	`118`	`+ void SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants)`
	`119`	`+ {`
	`120`	`+ UNSUPPORTED("Inline constants may only be set for uniform buffers");`
	`121`	`+ }`
`117`	`122`	`};`
`118`	`123`
`119`	`124`
`@@ -133,6 +138,8 @@ class ShaderVariableManagerGL : ShaderVariableManagerBase<EngineGLImplTraits, vo`
`133`	`138`	`}`
`134`	`139`
`135`	`140`	`void SetDynamicOffset(Uint32 ArrayIndex, Uint32 Offset);`
	`141`	`+`
	`142`	`+ void SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants);`
`136`	`143`	`};`
`137`	`144`
`138`	`145`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,10 @@ void ShaderVariableManagerGL::UniformBuffBindInfo::SetDynamicOffset(Uint32 Array`
`223`	`223`	`m_ParentManager.m_ResourceCache.SetDynamicUBOffset(Attr.CacheOffset + ArrayIndex, Offset);`
`224`	`224`	`}`
`225`	`225`
	`226`	`+void ShaderVariableManagerGL::UniformBuffBindInfo::SetConstants(const void* pConstants, Uint32 FirstConstant, Uint32 NumConstants)`
	`227`	`+{`
	`228`	`+ UNSUPPORTED("Not yet implemented");`
	`229`	`+}`
`226`	`230`
`227`	`231`	`void ShaderVariableManagerGL::TextureBindInfo::BindResource(const BindResourceInfo& BindInfo)`
`228`	`232`	`{`
Original file line number	Diff line number	Diff line change
`@@ -650,6 +650,14 @@ void ShaderVariableManagerVk::SetBufferDynamicOffset(Uint32 ResIndex,`
`650`	`650`	`m_ResourceCache.SetDynamicBufferOffset(Attribs.DescrSet, DstResCacheOffset, BufferDynamicOffset);`
`651`	`651`	`}`
`652`	`652`
	`653`	`+void ShaderVariableManagerVk::SetInlineConstants(Uint32 ResIndex,`
	`654`	`+ const void* pConstants,`
	`655`	`+ Uint32 FirstConstant,`
	`656`	`+ Uint32 NumConstants)`
	`657`	`+{`
	`658`	`+ UNSUPPORTED("Not yet implemented");`
	`659`	`+}`
	`660`	`+`
`653`	`661`	`IDeviceObject* ShaderVariableManagerVk::Get(Uint32 ArrayIndex, Uint32 ResIndex) const`
`654`	`662`	`{`
`655`	`663`	`const PipelineResourceDesc& ResDesc = GetResourceDesc(ResIndex);`