PipelineStateD3D11: handle inline constants flag

Author: TheMostDiligent

Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp

@@ -91,7 +91,14 @@ PipelineResourceSignatureDescWrapper PipelineStateD3D11Impl::GetDefaultResourceS
 
                     const SHADER_RESOURCE_TYPE    ResType  = Attribs.GetShaderResourceType();
                     const PIPELINE_RESOURCE_FLAGS ResFlags = Attribs.GetPipelineResourceFlags() | ShaderVariableFlagsToPipelineResourceFlags(VarDesc.Flags);
-                    SignDesc.AddResource(VarDesc.ShaderStages, Attribs.Name, Attribs.BindCount, ResType, VarDesc.Type, ResFlags);
+
+                    Uint32 ArraySize = Attribs.BindCount;
+                    if (ResFlags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
+                    {
+                        VERIFY(ResFlags == PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS, "INLINE_CONSTANTS flag cannot be combined with other flags.");
+                        ArraySize = Attribs.GetInlineConstantCountOrThrow(pShader->GetDesc().Name);
+                    }
+                    SignDesc.AddResource(VarDesc.ShaderStages, Attribs.Name, ArraySize, ResType, VarDesc.Type, ResFlags);
                 }
                 else
                 {

Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp

@@ -384,20 +384,8 @@ PipelineResourceSignatureDescWrapper PipelineStateD3D12Impl::GetDefaultResourceS
                         Uint32 ArraySize = Attribs.BindCount;
                         if (ResFlags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
                         {
-                            VERIFY_EXPR(ResType == SHADER_RESOURCE_TYPE_CONSTANT_BUFFER);
                             VERIFY(ResFlags == PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS, "INLINE_CONSTANTS flag cannot be combined with other flags.");
-                            if (Attribs.BindCount != 1)
-                            {
-                                LOG_ERROR_AND_THROW("Inline constants resource '", Attribs.Name, "' in shader '", pShader->GetDesc().Name,
-                                                    "' can not be an array.");
-                            }
-                            const Uint32 NumConstants = Attribs.GetConstantBufferSize() / sizeof(Uint32);
-                            if (NumConstants > 64)
-                            {
-                                LOG_ERROR_AND_THROW("Inline constants resource '", Attribs.Name, "' in shader '", pShader->GetDesc().Name,
-                                                    "' has ", NumConstants, " constants. The maximum supported number of inline constants is 64.");
-                            }
-                            ArraySize = NumConstants;
+                            ArraySize = Attribs.GetInlineConstantCountOrThrow(pShader->GetDesc().Name);
                         }
                         SignDesc.AddResource(VarDesc.ShaderStages, Attribs.Name, ArraySize, ResType, VarDesc.Type, ResFlags);
                     }

Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp

@@ -262,6 +262,26 @@ struct D3DShaderResourceAttribs
         return ExtraData;
     }
 
+    Uint32 GetInlineConstantCountOrThrow(const char* ShaderName) const
+    {
+        VERIFY_EXPR(GetShaderResourceType() == SHADER_RESOURCE_TYPE_CONSTANT_BUFFER);
+        if (BindCount != 1)
+        {
+            LOG_ERROR_AND_THROW("Inline constants resource '", Name, "' in shader '", ShaderName, "' can not be an array.");
+        }
+        const Uint32 NumConstants = GetConstantBufferSize() / sizeof(Uint32);
+
+        constexpr Uint32 kMaxInlineConstants = 64;
+        if (NumConstants > kMaxInlineConstants)
+        {
+            LOG_ERROR_AND_THROW("Inline constants resource '", Name, "' in shader '", ShaderName, "' has ",
+                                NumConstants, " constants. The maximum supported number of inline constants is ",
+                                kMaxInlineConstants, '.');
+        }
+
+        return NumConstants;
+    }
+
     SHADER_RESOURCE_TYPE    GetShaderResourceType() const;
     PIPELINE_RESOURCE_FLAGS GetPipelineResourceFlags() const;