ShaderVariableManagerVk: handle inline constants

Author: hzqst

Graphics/GraphicsEngineVulkan/include/ShaderResourceCacheVk.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");
@@ -246,6 +246,13 @@ class ShaderResourceCacheVk : public ShaderResourceCacheBase
                                 Uint32 DynamicBufferOffset);
 
 
+    // Sets inline constant data in the resource cache
+    void SetInlineConstants(Uint32      DescrSetIndex,
+                            Uint32      CacheOffset,
+                            const void* pConstants,
+                            Uint32      FirstConstant,
+                            Uint32      NumConstants);
+
     Uint32 GetNumDescriptorSets() const { return m_NumSets; }
     bool   HasDynamicResources() const { return m_NumDynamicBuffers > 0; }
 

Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp

@@ -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");
@@ -950,4 +950,13 @@ Uint32 ShaderResourceCacheVk::GetDynamicBufferOffsets(DeviceContextVkImpl*   pCt
     return OffsetInd - StartInd;
 }
 
+void ShaderResourceCacheVk::SetInlineConstants(Uint32      DescrSetIndex,
+                                               Uint32      CacheOffset,
+                                               const void* pConstants,
+                                               Uint32      FirstConstant,
+                                               Uint32      NumConstants)
+{
+    UNSUPPORTED("Not implemented yet");
+}
+
 } // namespace Diligent

Graphics/GraphicsEngineVulkan/src/ShaderVariableManagerVk.cpp

@@ -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");
@@ -286,7 +286,8 @@ BindResourceHelper::BindResourceHelper(const PipelineResourceSignatureVkImpl& Si
     m_DstRes            {m_CachedSet.GetResource(m_DstResCacheOffset)}
 // clang-format on
 {
-    VERIFY(ArrayIndex < m_ResDesc.ArraySize, "Array index is out of range, but it should've been corrected by ShaderVariableBase::SetArray()");
+    // For inline constants, GetArraySize() returns 1 (actual array size), while ArraySize is the number of constants
+    VERIFY(ArrayIndex < m_ResDesc.GetArraySize(), "Array index is out of range, but it should've been corrected by ShaderVariableBase::SetArray()");
     VERIFY(m_DstRes.Type == m_Attribs.GetDescriptorType(), "Inconsistent types");
 
 #ifdef DILIGENT_DEBUG
@@ -655,7 +656,21 @@ void ShaderVariableManagerVk::SetInlineConstants(Uint32      ResIndex,
                                                  Uint32      FirstConstant,
                                                  Uint32      NumConstants)
 {
-    UNSUPPORTED("Not yet implemented");
+    const PipelineResourceAttribsVk& Attribs     = m_pSignature->GetResourceAttribs(ResIndex);
+    const ResourceCacheContentType   CacheType   = m_ResourceCache.GetContentType();
+    const Uint32                     CacheOffset = Attribs.CacheOffset(CacheType);
+
+#ifdef DILIGENT_DEVELOPMENT
+    {
+        const PipelineResourceDesc& ResDesc = m_pSignature->GetResourceDesc(ResIndex);
+        VerifyInlineConstants(ResDesc, pConstants, FirstConstant, NumConstants);
+    }
+#endif
+
+    // All inline constants use the same path at PRS level - store data in the resource cache.
+    // The data will be used either for push constants (vkCmdPushConstants) or emulated buffers
+    // depending on the PSO's selection.
+    m_ResourceCache.SetInlineConstants(Attribs.DescrSet, CacheOffset, pConstants, FirstConstant, NumConstants);
 }
 
 IDeviceObject* ShaderVariableManagerVk::Get(Uint32 ArrayIndex, Uint32 ResIndex) const
@@ -664,7 +679,8 @@ IDeviceObject* ShaderVariableManagerVk::Get(Uint32 ArrayIndex, Uint32 ResIndex)
     const PipelineResourceAttribsVk& Attribs     = GetResourceAttribs(ResIndex);
     const Uint32                     CacheOffset = Attribs.CacheOffset(m_ResourceCache.GetContentType());
 
-    VERIFY_EXPR(ArrayIndex < ResDesc.ArraySize);
+    // For inline constants, GetArraySize() returns 1 (actual array size), while ArraySize is the number of constants
+    VERIFY_EXPR(ArrayIndex < ResDesc.GetArraySize());
 
     if (Attribs.DescrSet < m_ResourceCache.GetNumDescriptorSets())
     {