DeviceContextD3D11: update inline constant buffers (#672)

Author: TheMostDiligent

Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp

@@ -348,7 +348,7 @@ class ShaderResourceCacheD3D11 : public ShaderResourceCacheBase
     template <D3D11_RESOURCE_RANGE>
     __forceinline Uint32 GetResourceCount(Uint32 ShaderInd) const;
 
-    bool IsInitialized() const { return m_IsInitialized; }
+    bool IsInitialized() const { return m_Flags & FLAG_IS_INITIALIZED; }
 
     ResourceCacheContentType GetContentType() const { return m_ContentType; }
 
@@ -422,7 +422,7 @@ class ShaderResourceCacheD3D11 : public ShaderResourceCacheBase
 
     bool HasInlineConstants() const
     {
-        return false;
+        return m_Flags & FLAG_HAS_INLINE_CONSTANTS;
     }
 
 #ifdef DILIGENT_DEBUG
@@ -504,7 +504,14 @@ class ShaderResourceCacheD3D11 : public ShaderResourceCacheBase
 
     std::array<OffsetType, MaxOffsets> m_Offsets = {};
 
-    bool m_IsInitialized = false;
+    enum FLAGS : Uint8
+    {
+        FLAG_NONE                 = 0,
+        FLAG_IS_INITIALIZED       = 1u << 0u,
+        FLAG_HAS_INLINE_CONSTANTS = 1u << 1u,
+    };
+    DECLARE_FRIEND_FLAG_ENUM_OPERATORS(FLAGS)
+    FLAGS m_Flags = FLAG_NONE;
 
     // Indicates what types of resources are stored in the cache
     const ResourceCacheContentType m_ContentType;
@@ -518,6 +525,7 @@ class ShaderResourceCacheD3D11 : public ShaderResourceCacheBase
 
     std::unique_ptr<Uint8, STDDeleter<Uint8, IMemoryAllocator>> m_pResourceData;
 };
+DEFINE_FLAG_ENUM_OPERATORS(ShaderResourceCacheD3D11::FLAGS)
 
 template <>
 struct ShaderResourceCacheD3D11::CachedResourceTraits<D3D11_RESOURCE_RANGE_CBV>

Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp

@@ -460,17 +460,50 @@ void DeviceContextD3D11Impl::BindShaderResources(Uint32 BindSRBMask)
         else
         {
             // Bind constant buffers with dynamic offsets. In Direct3D11 only those buffers are counted as dynamic.
-            VERIFY((m_BindInfo.DynamicSRBMask & SignBit) != 0,
-                   "When bit in StaleSRBMask is not set, the same bit in DynamicSRBMask must be set. Check GetCommitMask().");
-            DEV_CHECK_ERR(pResourceCache->HasDynamicResources(),
-                          "Bit in DynamicSRBMask is set, but the cache does not contain dynamic resources. This may indicate that resources "
-                          "in the cache have changed, but the SRB has not been committed before the draw/dispatch command.");
-            if (pResourceCache->GetUAVCount(PSInd) > 0)
+            VERIFY(((m_BindInfo.DynamicSRBMask | m_BindInfo.InlineConstantsSRBMask) & SignBit) != 0,
+                   "When bit in StaleSRBMask is not set, the same bit in either DynamicSRBMask or InlineConstantsSRBMask must be set. Check GetCommitMask().");
+
+            if ((m_BindInfo.DynamicSRBMask & SignBit) != 0)
+            {
+                DEV_CHECK_ERR(pResourceCache->HasDynamicResources(),
+                              "Shader resource cache does not contain dynamic resources, but the corresponding bit in DynamicSRBMask is set. "
+                              "This may indicate that resources in the cache have changed, but the SRB has not been committed before the draw/dispatch command.");
+                if (pResourceCache->GetUAVCount(PSInd) > 0)
+                {
+                    if (PsUavBindMode != PixelShaderUAVBindMode::Bind)
+                        PsUavBindMode = PixelShaderUAVBindMode::Keep;
+                }
+                BindDynamicCBs(*pResourceCache, BaseBindings);
+            }
+            else
+            {
+                DEV_CHECK_ERR(!pResourceCache->HasDynamicResources(),
+                              "Shader resource cache contains dynamic resources, but the corresponding bit in DynamicSRBMask is not set. "
+                              "This may indicate that resources in the cache have changed, but the SRB has not been committed before the draw/dispatch command.");
+            }
+        }
+
+        if ((m_BindInfo.InlineConstantsSRBMask & SignBit) != 0)
+        {
+            VERIFY(pResourceCache->HasInlineConstants(),
+                   "Shader resource cache does not contain inline constants, but the corresponding bit in InlineConstantsSRBMask is set. "
+                   "This may be a bug because root constants mask in the cache never changes after SRB creation, "
+                   "while m_BindInfo.InlineConstantsSRBMask is initialized when SRB is committed.");
+            if (PipelineResourceSignatureD3D11Impl* pSign = m_pPipelineState->GetResourceSignature(SignIdx))
             {
-                if (PsUavBindMode != PixelShaderUAVBindMode::Bind)
-                    PsUavBindMode = PixelShaderUAVBindMode::Keep;
+                pSign->UpdateInlineConstantBuffers(*pResourceCache, m_pd3d11DeviceContext);
             }
-            BindDynamicCBs(*pResourceCache, BaseBindings);
+            else
+            {
+                UNEXPECTED("Pipeline resource signature is null for signature index ", SignIdx);
+            }
+        }
+        else
+        {
+            VERIFY(!pResourceCache->HasInlineConstants(),
+                   "Shader resource cache contains inline constants, but the corresponding bit in InlineConstantsSRBMask is not set. "
+                   "This may be a bug because root constants mask in the cache never changes after SRB creation, "
+                   "while m_BindInfo.InlineConstantsSRBMask is initialized when SRB is committed.");
         }
     }
 

Graphics/GraphicsEngineD3D11/src/ShaderResourceCacheD3D11.cpp

@@ -164,10 +164,17 @@ void ShaderResourceCacheD3D11::Initialize(const D3D11ShaderResourceCounters&
         }
     };
 
-    ProcessInlineCBs([&BufferSize](const InlineConstantBufferAttribsD3D11& InlineCBAttr) {
-        BufferSize += InlineCBAttr.NumConstants * sizeof(Uint32);
+    Uint32 TotalInlineConstants = 0;
+    ProcessInlineCBs([&TotalInlineConstants](const InlineConstantBufferAttribsD3D11& InlineCBAttr) {
+        TotalInlineConstants += InlineCBAttr.NumConstants;
     });
 
+    if (TotalInlineConstants > 0)
+    {
+        m_Flags |= FLAG_HAS_INLINE_CONSTANTS;
+        BufferSize += TotalInlineConstants * sizeof(Uint32);
+    }
+
     if (BufferSize > 0)
     {
         m_pResourceData = decltype(m_pResourceData){
@@ -186,16 +193,20 @@ void ShaderResourceCacheD3D11::Initialize(const D3D11ShaderResourceCounters&
         ConstructResources<D3D11_RESOURCE_RANGE_UAV>(ShaderInd);
     }
 
-    Uint32* pInlineCBData = reinterpret_cast<Uint32*>(m_pResourceData.get() + MemOffset);
-    // Initialize inline constant buffers.
-    ProcessInlineCBs([&pInlineCBData, this](const InlineConstantBufferAttribsD3D11& InlineCBAttr) {
-        VERIFY_EXPR(InlineCBAttr.NumConstants > 0);
-        VERIFY_EXPR(InlineCBAttr.pBuffer != nullptr);
-        InitInlineConstantBuffer(InlineCBAttr.BindPoints, InlineCBAttr.pBuffer, InlineCBAttr.NumConstants, pInlineCBData);
-        pInlineCBData += InlineCBAttr.NumConstants;
-    });
+    if (TotalInlineConstants > 0)
+    {
+        Uint32* pInlineCBData = reinterpret_cast<Uint32*>(m_pResourceData.get() + MemOffset);
+        // Initialize inline constant buffers.
+        ProcessInlineCBs([&pInlineCBData, this](const InlineConstantBufferAttribsD3D11& InlineCBAttr) {
+            VERIFY_EXPR(InlineCBAttr.NumConstants > 0);
+            VERIFY_EXPR(InlineCBAttr.pBuffer != nullptr);
+            InitInlineConstantBuffer(InlineCBAttr.BindPoints, InlineCBAttr.pBuffer, InlineCBAttr.NumConstants, pInlineCBData);
+            pInlineCBData += InlineCBAttr.NumConstants;
+        });
+        VERIFY_EXPR(pInlineCBData == reinterpret_cast<Uint32*>(m_pResourceData.get() + BufferSize));
+    }
 
-    m_IsInitialized = true;
+    m_Flags |= FLAG_IS_INITIALIZED;
 }
 
 ShaderResourceCacheD3D11::~ShaderResourceCacheD3D11()
@@ -210,8 +221,8 @@ ShaderResourceCacheD3D11::~ShaderResourceCacheD3D11()
             DestructResources<D3D11_RESOURCE_RANGE_SAMPLER>(ShaderInd);
             DestructResources<D3D11_RESOURCE_RANGE_UAV>(ShaderInd);
         }
-        m_Offsets       = {};
-        m_IsInitialized = false;
+        m_Offsets = {};
+        m_Flags   = FLAG_NONE;
 
         m_pResourceData.reset();
     }