Add tests for inline constants flag validation

Author: TheMostDiligent

Graphics/GraphicsEngine/src/PipelineResourceSignatureBase.cpp

@@ -119,11 +119,6 @@ void ValidatePipelineResourceSignatureDesc(const PipelineResourceSignatureDesc&
                                         "). INLINE_CONSTANTS flag cannot be combined with other flags.");
             }
 
-            if (Res.ArraySize == 0)
-            {
-                LOG_PRS_ERROR_AND_THROW("Desc.Resources[", i, "].ArraySize must be greater than 0 for inline constants.");
-            }
-
             if (Res.ArraySize > 64)
             {
                 LOG_PRS_ERROR_AND_THROW("Desc.Resources[", i, "].ArraySize (", Res.ArraySize,

Graphics/GraphicsEngineD3D11/src/ShaderVariableManagerD3D11.cpp

@@ -291,7 +291,6 @@ void ShaderVariableManagerD3D11::ConstBuffBindInfo::SetDynamicOffset(Uint32 Arra
     const PipelineResourceAttribsD3D11& Attr = GetAttribs();
     const PipelineResourceDesc&         Desc = GetDesc();
     VERIFY_EXPR(Desc.ResourceType == SHADER_RESOURCE_TYPE_CONSTANT_BUFFER);
-    VERIFY_EXPR((Desc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) == 0);
 #ifdef DILIGENT_DEVELOPMENT
     {
         const ShaderResourceCacheD3D11::CachedCB& CachedCB = m_ParentManager.m_ResourceCache.GetResource<D3D11_RESOURCE_RANGE_CBV>(Attr.BindPoints + ArrayIndex);
@@ -306,7 +305,6 @@ void ShaderVariableManagerD3D11::ConstBuffBindInfo::SetConstants(const void* pCo
     const PipelineResourceAttribsD3D11& Attr = GetAttribs();
     const PipelineResourceDesc&         Desc = GetDesc();
     VERIFY_EXPR(Desc.ResourceType == SHADER_RESOURCE_TYPE_CONSTANT_BUFFER);
-    VERIFY_EXPR(Desc.Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS);
 #ifdef DILIGENT_DEVELOPMENT
     {
         VerifyInlineConstants(Desc, pConstants, FirstConstant, NumConstants);

Tests/DiligentCoreAPITest/src/ObjectCreationFailure/PRSCreationFailureTest.cpp

@@ -271,6 +271,30 @@ TEST(PRSCreationFailureTest, InvalidCombinedSamplerFlag)
     TestCreatePRSFailure(PRSDesc, "Desc.Resources[0].Flags contain COMBINED_SAMPLER flag, but Desc.UseCombinedTextureSamplers is false");
 }
 
+TEST(PRSCreationFailureTest, InvalidInlineConstantsFlag)
+{
+    PipelineResourceSignatureDesc PRSDesc;
+    PRSDesc.Name                       = "Invalid inline constants Flag";
+    PRSDesc.UseCombinedTextureSamplers = false;
+    PipelineResourceDesc Resources[]{
+        {SHADER_TYPE_PIXEL, "g_InlineConstants", 1, SHADER_RESOURCE_TYPE_CONSTANT_BUFFER, SHADER_RESOURCE_VARIABLE_TYPE_STATIC, PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS | PIPELINE_RESOURCE_FLAG_NO_DYNAMIC_BUFFERS}};
+    PRSDesc.Resources    = Resources;
+    PRSDesc.NumResources = _countof(Resources);
+    TestCreatePRSFailure(PRSDesc, "INLINE_CONSTANTS flag cannot be combined with other flags");
+}
+
+TEST(PRSCreationFailureTest, InvalidInlineConstantCount)
+{
+    PipelineResourceSignatureDesc PRSDesc;
+    PRSDesc.Name                       = "Invalid inline constant count";
+    PRSDesc.UseCombinedTextureSamplers = false;
+    PipelineResourceDesc Resources[]{
+        {SHADER_TYPE_PIXEL, "g_InlineConstants", 65, SHADER_RESOURCE_TYPE_CONSTANT_BUFFER, SHADER_RESOURCE_VARIABLE_TYPE_STATIC, PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS}};
+    PRSDesc.Resources    = Resources;
+    PRSDesc.NumResources = _countof(Resources);
+    TestCreatePRSFailure(PRSDesc, "Desc.Resources[0].ArraySize (65) exceeds the maximum allowed value (64) for inline constants.");
+}
+
 TEST(PRSCreationFailureTest, InvalidAssignedSamplerResourceType)
 {
     PipelineResourceSignatureDesc PRSDesc;

Tests/DiligentCoreAPITest/src/ObjectCreationFailure/PSOCreationFailureTest.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -887,6 +887,20 @@ TEST_F(PSOCreationFailureTest, OverlappingImmutableSamplerStages)
     TestCreatePSOFailure(PsoCI, "'g_Texture_sampler' is defined in overlapping shader stages (SHADER_TYPE_VERTEX, SHADER_TYPE_GEOMETRY and SHADER_TYPE_VERTEX, SHADER_TYPE_PIXEL)");
 }
 
+TEST_F(PSOCreationFailureTest, InvalidInlineConstantsFlag)
+{
+    auto PsoCI{GetGraphicsPSOCreateInfo("PSO Create Failure - Invalid Inline Constants Flag")};
+
+    ShaderResourceVariableDesc Variables[] //
+        {
+            ShaderResourceVariableDesc{SHADER_TYPE_VERTEX | SHADER_TYPE_PIXEL, "g_Texture", SHADER_RESOURCE_VARIABLE_TYPE_STATIC},
+            ShaderResourceVariableDesc{SHADER_TYPE_VERTEX | SHADER_TYPE_PIXEL, "g_InlineConstants", SHADER_RESOURCE_VARIABLE_TYPE_STATIC, SHADER_VARIABLE_FLAG_INLINE_CONSTANTS | SHADER_VARIABLE_FLAG_NO_DYNAMIC_BUFFERS} //
+        };
+    PsoCI.PSODesc.ResourceLayout.Variables    = Variables;
+    PsoCI.PSODesc.ResourceLayout.NumVariables = _countof(Variables);
+    TestCreatePSOFailure(PsoCI, "ResourceLayout.Variables[1].Flags: INLINE_CONSTANTS flag cannot be combined with other flags.");
+}
+
 TEST_F(PSOCreationFailureTest, RenderPassWithNonZeroNumRenderTargets)
 {
     auto PsoCI{GetGraphicsPSOCreateInfo("PSO Create Failure - Render Pass With non-zero NumRenderTargets", true)};
@@ -1167,7 +1181,7 @@ TEST_F(PSOCreationFailureTest, NullProcHitShader)
     TestCreatePSOFailure(PsoCI, "pProceduralHitShaders[0].pIntersectionShader must not be null");
 }
 
-TEST_F(PSOCreationFailureTest, InvalidShaderinGeneralGroup)
+TEST_F(PSOCreationFailureTest, InvalidShaderInGeneralGroup)
 {
     if (!HasRayTracing())
         GTEST_SKIP();
@@ -1180,7 +1194,7 @@ TEST_F(PSOCreationFailureTest, InvalidShaderinGeneralGroup)
     TestCreatePSOFailure(PsoCI, "SHADER_TYPE_RAY_CLOSEST_HIT is not a valid type for ray tracing general shader");
 }
 
-TEST_F(PSOCreationFailureTest, InvalidShaderinTriangleHitGroup1)
+TEST_F(PSOCreationFailureTest, InvalidShaderInTriangleHitGroup1)
 {
     if (!HasRayTracing())
         GTEST_SKIP();
@@ -1197,7 +1211,7 @@ TEST_F(PSOCreationFailureTest, InvalidShaderinTriangleHitGroup1)
     TestCreatePSOFailure(PsoCI, "SHADER_TYPE_RAY_MISS is not a valid type for ray tracing triangle closest hit");
 }
 
-TEST_F(PSOCreationFailureTest, InvalidShaderinTriangleHitGroup2)
+TEST_F(PSOCreationFailureTest, InvalidShaderInTriangleHitGroup2)
 {
     if (!HasRayTracing())
         GTEST_SKIP();
@@ -1214,7 +1228,7 @@ TEST_F(PSOCreationFailureTest, InvalidShaderinTriangleHitGroup2)
     TestCreatePSOFailure(PsoCI, "SHADER_TYPE_RAY_INTERSECTION is not a valid type for ray tracing triangle any hit");
 }
 
-TEST_F(PSOCreationFailureTest, InvalidShaderinProceduralHitGroup1)
+TEST_F(PSOCreationFailureTest, InvalidShaderInProceduralHitGroup1)
 {
     if (!HasRayTracing())
         GTEST_SKIP();
@@ -1232,7 +1246,7 @@ TEST_F(PSOCreationFailureTest, InvalidShaderinProceduralHitGroup1)
     TestCreatePSOFailure(PsoCI, "SHADER_TYPE_CALLABLE is not a valid type for ray tracing procedural intersection");
 }
 
-TEST_F(PSOCreationFailureTest, InvalidShaderinProceduralHitGroup2)
+TEST_F(PSOCreationFailureTest, InvalidShaderInProceduralHitGroup2)
 {
     if (!HasRayTracing())
         GTEST_SKIP();
@@ -1250,7 +1264,7 @@ TEST_F(PSOCreationFailureTest, InvalidShaderinProceduralHitGroup2)
     TestCreatePSOFailure(PsoCI, "SHADER_TYPE_RAY_GEN is not a valid type for ray tracing procedural closest hit");
 }
 
-TEST_F(PSOCreationFailureTest, InvalidShaderinProceduralHitGroup3)
+TEST_F(PSOCreationFailureTest, InvalidShaderInProceduralHitGroup3)
 {
     if (!HasRayTracing())
         GTEST_SKIP();