D3D11: fix inline constant buffers remapping; enable inline constant tests

Author: TheMostDiligent

Graphics/GraphicsEngine/interface/PipelineResourceSignature.h

@@ -353,6 +353,13 @@ struct PipelineResourceDesc
     {
         return !(*this == Rhs);
     }
+
+    Uint32 GetArraySize() const noexcept
+    {
+        return (Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) != 0 ?
+                1 : // For inline constants, ArraySize is the number of 4-byte constants.
+                ArraySize;
+    }
 #endif
 };
 typedef struct PipelineResourceDesc PipelineResourceDesc;

Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp

@@ -687,7 +687,7 @@ inline ShaderResourceCacheD3D11::MinMaxSlot ShaderResourceCacheD3D11::BindCBs(
         // Offsets in Direct3D11 are measure in float4 constants.
         const UINT FirstCBConstant = StaticCast<UINT>((ResArrays.first[res].BaseOffset + ResArrays.first[res].DynamicOffset) / 16u);
         // The number of constants must be a multiple of 16 constants. It is OK if it is past the end of the buffer.
-        const UINT NumCBConstants = StaticCast<UINT>(AlignUp(ResArrays.first[res].RangeSize / 16u, 16u));
+        const UINT NumCBConstants = StaticCast<UINT>(AlignUp((ResArrays.first[res].RangeSize + 15u) / 16u, 16u));
         // clang-format off
         if (CommittedD3D11Resources[Slot] != pd3d11CB        ||
             FirstConstants[Slot]          != FirstCBConstant ||
@@ -734,7 +734,7 @@ inline void ShaderResourceCacheD3D11::BindDynamicCBs(Uint32
         // Offsets in Direct3D11 are measure in float4 constants.
         const UINT FirstCBConstant = StaticCast<UINT>((CB.BaseOffset + CB.DynamicOffset) / 16u);
         // The number of constants must be a multiple of 16 constants. It is OK if it is past the end of the buffer.
-        const UINT NumCBConstants = StaticCast<UINT>(AlignUp(CB.RangeSize / 16u, 16u));
+        const UINT NumCBConstants = StaticCast<UINT>(AlignUp((CB.RangeSize + 15u) / 16u, 16u));
         // clang-format off
         if (CommittedD3D11Resources[Slot] != pd3d11CB        ||
             FirstConstants[Slot]          != FirstCBConstant ||

Graphics/GraphicsEngineD3D11/src/PipelineResourceSignatureD3D11Impl.cpp

@@ -212,9 +212,8 @@ void PipelineResourceSignatureD3D11Impl::CreateLayout(const bool IsSerialized)
 
             VERIFY((ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) == 0 || ResDesc.ResourceType == SHADER_RESOURCE_TYPE_CONSTANT_BUFFER,
                    "Only constant buffers can have inline constants flag");
-            const Uint32 ArraySize = (ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) != 0 ?
-                1 : // For inline constants, count only one resource as the ArraySize is the number of 4-byte constants.
-                ResDesc.ArraySize;
+            // For inline constants, ArraySize holds the number of 4-byte constants
+            const Uint32 ArraySize = ResDesc.GetArraySize();
             AllocBindPoints(m_ResourceCounters, BindPoints, ResDesc.ShaderStages, ArraySize, Range);
             if (ResDesc.VarType == SHADER_RESOURCE_VARIABLE_TYPE_STATIC)
             {
@@ -229,7 +228,8 @@ void PipelineResourceSignatureD3D11Impl::CreateLayout(const bool IsSerialized)
                 }
             }
 
-            if (Range == D3D11_RESOURCE_RANGE_CBV && (ResDesc.Flags & PIPELINE_RESOURCE_FLAG_NO_DYNAMIC_BUFFERS) == 0)
+            if (Range == D3D11_RESOURCE_RANGE_CBV &&
+                (ResDesc.Flags & (PIPELINE_RESOURCE_FLAG_NO_DYNAMIC_BUFFERS | PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)) == 0)
             {
                 // Set corresponding bits in m_DynamicCBSlotsMask
                 for (SHADER_TYPE ShaderStages = ResDesc.ShaderStages; ShaderStages != SHADER_TYPE_UNKNOWN;)
@@ -436,9 +436,9 @@ void PipelineResourceSignatureD3D11Impl::UpdateShaderResourceBindingMap(Resource
             ResourceBinding::BindInfo BindInfo //
                 {
                     Uint32{BaseBindings[Range][ShaderInd]} + Uint32{ResAttr.BindPoints[ShaderInd]},
-                    0u, // register space is not supported
-                    ResDesc.ArraySize,
-                    ResDesc.ResourceType //
+                    0u,                     // register space is not supported
+                    ResDesc.GetArraySize(), // For inline constants, ArraySize holds the number of 4-byte constants
+                    ResDesc.ResourceType,
                 };
             bool IsUnique = ResourceMap.emplace(HashMapStringKey{ResDesc.Name}, BindInfo).second;
             VERIFY(IsUnique, "Shader resource '", ResDesc.Name,

Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp

@@ -284,9 +284,8 @@ void PipelineResourceSignatureD3D12Impl::AllocateRootParameters(const bool IsSer
                 // Normal resources go into space 0.
                 Space    = 0;
                 Register = NumResources[d3d12DescriptorRangeType];
-                NumResources[d3d12DescriptorRangeType] += (ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) != 0 ?
-                    1 : // For inline constants, count only one resource as the ArraySize is the number of 4-byte constants.
-                    ResDesc.ArraySize;
+                // For inline constants, ArraySize holds the number of 4-byte constants.
+                NumResources[d3d12DescriptorRangeType] += ResDesc.GetArraySize();
             }
 
             const PIPELINE_RESOURCE_FLAGS dbgValidResourceFlags = GetValidPipelineResourceFlags(ResDesc.ResourceType);
@@ -732,15 +731,12 @@ void PipelineResourceSignatureD3D12Impl::UpdateShaderResourceBindingMap(Resource
         {
             VERIFY((ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) == 0 || ResDesc.ResourceType == SHADER_RESOURCE_TYPE_CONSTANT_BUFFER,
                    "Only constant buffers can be marked as INLINE_CONSTANTS. This error should've been caught by ValidatePipelineResourceSignatureDesc().");
-            const Uint32 ArraySize = (ResDesc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) ?
-                1 : // For inline constants, ArraySize is the number of 4-byte constants
-                ResDesc.ArraySize;
 
             ResourceBinding::BindInfo BindInfo //
                 {
                     Attribs.Register,
                     Attribs.Space + BaseRegisterSpace,
-                    ArraySize,
+                    ResDesc.GetArraySize(), // For inline constants, ArraySize holds the number of 4-byte constants
                     ResDesc.ResourceType,
                 };
             bool IsUnique = ResourceMap.emplace(HashMapStringKey{ResDesc.Name}, BindInfo).second;

Tests/DiligentCoreAPITest/src/InlineConstantsTest.cpp

@@ -129,7 +129,7 @@ class InlineConstants : public ::testing::Test
         GPUTestingEnvironment* pEnv    = GPUTestingEnvironment::GetInstance();
         IRenderDevice*         pDevice = pEnv->GetDevice();
 
-        if (pDevice->GetDeviceInfo().Type != RENDER_DEVICE_TYPE_D3D12)
+        if (!pDevice->GetDeviceInfo().IsD3DDevice())
         {
             GTEST_SKIP();
         }