ShaderVarManagerD3D12: properly handle offset from table start for inline constants (#672)

Author: TheMostDiligent

Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp

@@ -295,6 +295,7 @@ class ShaderResourceCacheD3D12 : public ShaderResourceCacheBase
                                 Uint32 BufferDynamicOffset);
 
     void SetInlineConstants(Uint32      RootIndex,
+                            Uint32      OffsetFromTableStart,
                             const void* pConstants,
                             Uint32      FirstConstant,
                             Uint32      NumConstants);

Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp

@@ -459,12 +459,13 @@ void ShaderResourceCacheD3D12::SetBufferDynamicOffset(Uint32 RootIndex,
 }
 
 void ShaderResourceCacheD3D12::SetInlineConstants(Uint32      RootIndex,
+                                                  Uint32      OffsetFromTableStart,
                                                   const void* pConstants,
                                                   Uint32      FirstConstant,
                                                   Uint32      NumConstants)
 {
     RootTable& Tbl = GetRootTable(RootIndex);
-    Resource&  Res = Tbl.GetResource(0);
+    Resource&  Res = Tbl.GetResource(OffsetFromTableStart);
     VERIFY_EXPR(Res.Type == SHADER_RESOURCE_TYPE_CONSTANT_BUFFER);
     VERIFY(Res.IsNull(), "There should be no resource bound for root constants as they contain raw data.");
     VERIFY(Res.CPUDescriptorHandle.ptr != 0, "Resources used to store root constants must have valid pointer to the data.");

Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp

@@ -674,10 +674,10 @@ void ShaderVariableManagerD3D12::SetInlineConstants(Uint32      ResIndex,
                                                     Uint32      FirstConstant,
                                                     Uint32      NumConstants)
 {
-    const ResourceAttribs&         Attribs   = m_pSignature->GetResourceAttribs(ResIndex);
-    const ResourceCacheContentType CacheType = m_ResourceCache.GetContentType();
-    const Uint32                   RootIndex = Attribs.RootIndex(CacheType);
-    VERIFY_EXPR(Attribs.OffsetFromTableStart(CacheType) == 0);
+    const ResourceAttribs&         Attribs              = m_pSignature->GetResourceAttribs(ResIndex);
+    const ResourceCacheContentType CacheType            = m_ResourceCache.GetContentType();
+    const Uint32                   RootIndex            = Attribs.RootIndex(CacheType);
+    const Uint32                   OffsetFromTableStart = Attribs.OffsetFromTableStart(CacheType);
 
 #ifdef DILIGENT_DEVELOPMENT
     {
@@ -686,7 +686,7 @@ void ShaderVariableManagerD3D12::SetInlineConstants(Uint32      ResIndex,
     }
 #endif
 
-    m_ResourceCache.SetInlineConstants(RootIndex, pConstants, FirstConstant, NumConstants);
+    m_ResourceCache.SetInlineConstants(RootIndex, OffsetFromTableStart, pConstants, FirstConstant, NumConstants);
 }
 
 IDeviceObject* ShaderVariableManagerD3D12::Get(Uint32 ArrayIndex,