Allow empty ShaderResource.

Author: hzqst

Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp

@@ -92,7 +92,13 @@ class ShaderVkImpl final : public ShaderBase<EngineVkImplTraits>
 
     const std::shared_ptr<const SPIRVShaderResources>& GetShaderResources() const
     {
-        DEV_CHECK_ERR(!IsCompiling(), "Shader resources are not available until the shader is compiled. Use GetStatus() to check the shader status.");
+        //DEV_CHECK_ERR(!IsCompiling(), "Shader resources are not available until the shader is compiled. Use GetStatus() to check the shader status.");
+
+        static const std::shared_ptr<const SPIRVShaderResources> NullShaderResource;
+        // NOTE: while shader is compiled asynchronously, is not available
+        if (IsCompiling())
+            return NullShaderResource;
+
         return m_pShaderResources;
     }
 

Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp

@@ -636,22 +636,14 @@ PipelineResourceSignatureDescWrapper PipelineStateVkImpl::GetDefaultResourceSign
 
                         // For inline constants, ArraySize specifies the number of 32-bit constants,
                         // not the array dimension. We need to calculate it from the buffer size.
+                        // the SPIRV ArraySize is 1 (buffer is not an array), but we need
+                        // the number of 32-bit constants which is BufferStaticSize / sizeof(Uint32)
                         Uint32 ArraySize = Attribs.ArraySize;
-                        if ((Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) != 0)
+                        if (Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
                         {
-                            // For inline constants specified via ShaderResourceVariableDesc,
-                            // the SPIRV ArraySize is 1 (buffer is not an array), but we need
-                            // the number of 32-bit constants which is BufferStaticSize / sizeof(Uint32)
-                            if (Attribs.BufferStaticSize > 0)
-                            {
-                                ArraySize = Attribs.BufferStaticSize / sizeof(Uint32);
-                            }
-                            else
-                            {
-                                LOG_ERROR_AND_THROW("Resource '", Attribs.Name, "' in shader '", pShader->GetDesc().Name,
-                                                    "' is marked as inline constants, but has zero buffer size. "
-                                                    "Make sure the buffer type is defined in the shader.");
-                            }
+                            VERIFY(Flags == 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, Flags);

Graphics/ShaderTools/include/SPIRVShaderResources.hpp

@@ -131,6 +131,39 @@ struct SPIRVShaderResourceAttribs
     {
         return IsMS != 0;
     }
+
+    Uint32 GetConstantBufferSize() const
+    {
+        VERIFY((Type == PushConstant || Type == UniformBuffer), "Invalid resource type: PushConstant or UniformBuffer expected");
+        return BufferStaticSize;
+    }
+
+    Uint32 GetInlineConstantCountOrThrow(const char* ShaderName) const
+    {
+        VERIFY_EXPR(Type == PushConstant || Type == UniformBuffer);
+
+        if (ArraySize != 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, '.');
+        }
+
+        if (NumConstants == 0)
+        {
+            LOG_ERROR_AND_THROW("Resource '", Name, "' in shader '", ShaderName,
+                                "' is marked as inline constants, but has zero buffer size. ");
+        }
+
+        return NumConstants;
+    }
 };
 static_assert(sizeof(SPIRVShaderResourceAttribs) % sizeof(void*) == 0, "Size of SPIRVShaderResourceAttribs struct must be multiple of sizeof(void*)");