ResourceCacheD3D12: implement SetInlineConstants (#672)

Author: TheMostDiligent

Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp

@@ -165,6 +165,12 @@ bool VerifyResourceBinding(const char*                 ExpectedResourceTypeName,
                            const IDeviceObject*        pCachedObject, // Object already set in the cache
                            const char*                 SignatureName)
 {
+    if (ResDesc.ResourceType == SHADER_RESOURCE_TYPE_INLINE_CONSTANTS)
+    {
+        RESOURCE_VALIDATION_FAILURE("Cannot bind resources to inline constants variable '", GetShaderResourcePrintName(ResDesc, BindInfo.ArrayIndex), '\'');
+        return false;
+    }
+
     if (BindInfo.pObject != nullptr && pResourceImpl == nullptr)
     {
         std::stringstream ss;
@@ -602,6 +608,34 @@ bool VerifyDynamicBufferOffset(const PipelineResourceDesc& ResDesc,
 }
 
 
+inline bool VerifyInlineConstants(const PipelineResourceDesc& ResDesc,
+                                  const void*                 pConstants,
+                                  Uint32                      FirstConstant,
+                                  Uint32                      NumConstants)
+{
+    bool ParamsOK = true;
+    if (ResDesc.ResourceType != SHADER_RESOURCE_TYPE_INLINE_CONSTANTS)
+    {
+        RESOURCE_VALIDATION_FAILURE("SetInlineConstants() is only allowed for inline constant variables.");
+        ParamsOK = false;
+    }
+
+    if (pConstants == nullptr)
+    {
+        RESOURCE_VALIDATION_FAILURE("Pointer to inline constants is null.");
+        ParamsOK = false;
+    }
+
+    if (FirstConstant + NumConstants > ResDesc.ArraySize)
+    {
+        RESOURCE_VALIDATION_FAILURE("Inline constant range (", FirstConstant, " .. ", FirstConstant + NumConstants - 1,
+                                    ") is out of bounds for variable '", ResDesc.Name, "' of size ", ResDesc.ArraySize, " constants.");
+        ParamsOK = false;
+    }
+
+    return ParamsOK;
+}
+
 #undef RESOURCE_VALIDATION_FAILURE
 
 template <typename ShaderVectorType>

Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp

@@ -281,6 +281,11 @@ class ShaderResourceCacheD3D12 : public ShaderResourceCacheBase
                                 Uint32 OffsetFromTableStart,
                                 Uint32 BufferDynamicOffset);
 
+    void SetInlineConstants(Uint32      RootIndex,
+                            const void* pConstants,
+                            Uint32      FirstConstant,
+                            Uint32      NumConstants);
+
     const RootTable& GetRootTable(Uint32 RootIndex) const
     {
         VERIFY_EXPR(RootIndex < m_NumTables);

Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp

@@ -386,6 +386,22 @@ void ShaderResourceCacheD3D12::SetBufferDynamicOffset(Uint32 RootIndex,
     Res.BufferDynamicOffset = BufferDynamicOffset;
 }
 
+void ShaderResourceCacheD3D12::SetInlineConstants(Uint32      RootIndex,
+                                                  const void* pConstants,
+                                                  Uint32      FirstConstant,
+                                                  Uint32      NumConstants)
+{
+    RootTable& Tbl = GetRootTable(RootIndex);
+    Resource&  Res = Tbl.GetResource(0);
+    VERIFY_EXPR(Res.Type == SHADER_RESOURCE_TYPE_INLINE_CONSTANTS);
+    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.");
+    VERIFY(FirstConstant + NumConstants <= Res.BufferRangeSize,
+           "Too many constants (", FirstConstant + NumConstants, ") for the allocated space (", Res.BufferRangeSize, ")");
+    Uint32* pDstConstants = reinterpret_cast<Uint32*>(Res.CPUDescriptorHandle.ptr);
+    memcpy(pDstConstants + FirstConstant, pConstants, NumConstants * sizeof(Uint32));
+}
+
 const ShaderResourceCacheD3D12::Resource& ShaderResourceCacheD3D12::CopyResource(ID3D12Device*   pd3d12Device,
                                                                                  Uint32          RootIndex,
                                                                                  Uint32          OffsetFromTableStart,

Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp

@@ -678,7 +678,19 @@ void ShaderVariableManagerD3D12::SetInlineConstants(Uint32      ResIndex,
                                                     Uint32      FirstConstant,
                                                     Uint32      NumConstants)
 {
-    UNSUPPORTED("Not implemented yet");
+    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);
+
+#ifdef DILIGENT_DEVELOPMENT
+    {
+        const PipelineResourceDesc& ResDesc = m_pSignature->GetResourceDesc(ResIndex);
+        VerifyInlineConstants(ResDesc, pConstants, FirstConstant, NumConstants);
+    }
+#endif
+
+    m_ResourceCache.SetInlineConstants(RootIndex, pConstants, FirstConstant, NumConstants);
 }
 
 IDeviceObject* ShaderVariableManagerD3D12::Get(Uint32 ArrayIndex,