ResourceSignatureD3D11: implement inline constant buffers update (#672)

Author: TheMostDiligent

Graphics/GraphicsEngineD3D11/include/PipelineResourceSignatureD3D11Impl.hpp

@@ -113,6 +113,8 @@ class PipelineResourceSignatureD3D11Impl final : public PipelineResourceSignatur
     // Make the base class method visible
     using TPipelineResourceSignatureBase::CopyStaticResources;
 
+    void UpdateInlineConstantBuffers(const ShaderResourceCacheD3D11& ResourceCache, ID3D11DeviceContext* pd3d11Ctx) const;
+
 #ifdef DILIGENT_DEVELOPMENT
     /// Verifies committed resource using the D3D resource attributes from the PSO.
     bool DvpValidateCommittedResource(const D3DShaderResourceAttribs& D3DAttribs,

Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp

@@ -280,17 +280,19 @@ class ShaderResourceCacheD3D11 : public ShaderResourceCacheBase
                                           Uint32                         NumConstants);
 
     template <D3D11_RESOURCE_RANGE ResRange>
-    __forceinline const typename CachedResourceTraits<ResRange>::CachedResourceType& GetResource(const D3D11ResourceBindPoints& BindPoints) const
+    __forceinline const typename CachedResourceTraits<ResRange>::CachedResourceType& GetResource(
+        const D3D11ResourceBindPoints&                               BindPoints,
+        typename CachedResourceTraits<ResRange>::D3D11ResourceType** ppd3d11Resource = nullptr) const
     {
         VERIFY(BindPoints.GetActiveStages() != SHADER_TYPE_UNKNOWN, "No active shader stage");
         const Int32 FirstStageInd     = GetFirstShaderStageIndex(BindPoints.GetActiveStages());
         const Uint8 FirstStageBinding = BindPoints[FirstStageInd];
         VERIFY(FirstStageBinding < GetResourceCount<ResRange>(FirstStageInd), "Resource slot is out of range");
         const auto  FirstStageResArrays = GetConstResourceArrays<ResRange>(FirstStageInd);
         const auto& CachedRes           = FirstStageResArrays.first[FirstStageBinding];
+        auto*       pd3d11Res           = FirstStageResArrays.second[FirstStageBinding];
 #ifdef DILIGENT_DEBUG
         {
-            const auto* pd3d11Res = FirstStageResArrays.second[FirstStageBinding];
             for (SHADER_TYPE ActiveStages = BindPoints.GetActiveStages(); ActiveStages != SHADER_TYPE_UNKNOWN;)
             {
                 const Int32 ShaderInd = ExtractFirstShaderStageIndex(ActiveStages);
@@ -300,6 +302,8 @@ class ShaderResourceCacheD3D11 : public ShaderResourceCacheBase
             }
         }
 #endif
+        if (ppd3d11Resource != nullptr)
+            *ppd3d11Resource = pd3d11Res;
         return CachedRes;
     }
 

Graphics/GraphicsEngineD3D11/src/PipelineResourceSignatureD3D11Impl.cpp

@@ -492,6 +492,30 @@ void PipelineResourceSignatureD3D11Impl::UpdateShaderResourceBindingMap(Resource
     }
 }
 
+void PipelineResourceSignatureD3D11Impl::UpdateInlineConstantBuffers(const ShaderResourceCacheD3D11& ResourceCache, ID3D11DeviceContext* pd3d11Ctx) const
+{
+    for (Uint32 i = 0; i < m_NumInlineConstantBuffers; ++i)
+    {
+        const InlineConstantBufferAttribsD3D11& InlineCBAttr = m_InlineConstantBuffers[i];
+
+        ID3D11Buffer*                             pd3d11CB = nullptr;
+        const ShaderResourceCacheD3D11::CachedCB& InlineCB = ResourceCache.GetResource<D3D11_RESOURCE_RANGE_CBV>(InlineCBAttr.BindPoints, &pd3d11CB);
+        VERIFY(InlineCBAttr.NumConstants * sizeof(Uint32) == InlineCB.RangeSize, "Inline constant buffer size mismatch");
+        VERIFY(InlineCB.pInlineConstantData != nullptr, "Inline constant data pointer is null");
+
+        D3D11_MAPPED_SUBRESOURCE MappedData{};
+        if (SUCCEEDED(pd3d11Ctx->Map(pd3d11CB, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedData)))
+        {
+            memcpy(MappedData.pData, InlineCB.pInlineConstantData, InlineCBAttr.NumConstants * sizeof(Uint32));
+            pd3d11Ctx->Unmap(pd3d11CB, 0);
+        }
+        else
+        {
+            DEV_ERROR("Failed to map inline constant buffer");
+        }
+    }
+}
+
 #ifdef DILIGENT_DEVELOPMENT
 bool PipelineResourceSignatureD3D11Impl::DvpValidateCommittedResource(const D3DShaderResourceAttribs& D3DAttribs,
                                                                       Uint32                          ResIndex,