Inline Constants test: use constants in PS (#672)

Author: TheMostDiligent

Tests/DiligentCoreAPITest/src/InlineConstantsTest.cpp

@@ -45,9 +45,6 @@ void RenderDrawCommandReference(ISwapChain* pSwapChain, const float* pClearColor
 using namespace Diligent;
 using namespace Diligent::Testing;
 
-#include "InlineShaders/DrawCommandTestHLSL.h"
-
-
 namespace
 {
 
@@ -80,8 +77,31 @@ void main(uint VertexId : SV_VertexId,
 }
 )"};
 
+const std::string InlineConstantsTest_PS{
+    R"(
+struct PSInput
+{
+    float4 Pos   : SV_POSITION;
+    float3 Color : COLOR;
+};
+
+cbuffer cbInlineColors
+{
+    float4 g_Colors[3];
 }
 
+float4 main(in PSInput PSIn) : SV_Target
+{
+    float3 Color = PSIn.Color.rgb;
+    Color.r *= g_Colors[0].a;
+    Color.g *= g_Colors[1].a;
+    Color.b *= g_Colors[2].a;
+    return float4(Color, 1.0);
+}
+)"};
+
+} // namespace HLSL
+
 float4 g_Positions[] = {
     float4{-1.0f, -0.5f, 0.f, 1.f},
     float4{-0.5f, +0.5f, 0.f, 1.f},
@@ -109,6 +129,11 @@ class InlineConstants : public ::testing::Test
         GPUTestingEnvironment* pEnv    = GPUTestingEnvironment::GetInstance();
         IRenderDevice*         pDevice = pEnv->GetDevice();
 
+        if (pDevice->GetDeviceInfo().Type != RENDER_DEVICE_TYPE_D3D12)
+        {
+            GTEST_SKIP();
+        }
+
         ShaderCreateInfo ShaderCI;
         ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
         ShaderCI.ShaderCompiler = pEnv->GetDefaultCompiler(ShaderCI.SourceLanguage);
@@ -124,7 +149,7 @@ class InlineConstants : public ::testing::Test
         {
             ShaderCI.Desc       = {"Inline constants test", SHADER_TYPE_PIXEL, true};
             ShaderCI.EntryPoint = "main";
-            ShaderCI.Source     = HLSL::DrawTest_PS.c_str();
+            ShaderCI.Source     = HLSL::InlineConstantsTest_PS.c_str();
             pDevice->CreateShader(ShaderCI, &sm_Res.pPS);
             ASSERT_NE(sm_Res.pPS, nullptr);
         }
@@ -175,10 +200,6 @@ TEST_F(InlineConstants, ResourceLayout)
     IRenderDevice*         pDevice    = pEnv->GetDevice();
     IDeviceContext*        pContext   = pEnv->GetDeviceContext();
     ISwapChain*            pSwapChain = pEnv->GetSwapChain();
-    if (pDevice->GetDeviceInfo().Type != RENDER_DEVICE_TYPE_D3D12)
-    {
-        GTEST_SKIP();
-    }
 
     for (Uint32 pos_type = 0; pos_type < SHADER_RESOURCE_VARIABLE_TYPE_NUM_TYPES; ++pos_type)
     {
@@ -195,7 +216,7 @@ TEST_F(InlineConstants, ResourceLayout)
             PipelineResourceLayoutDescX ResLayoutDesc;
             ResLayoutDesc
                 .AddVariable(SHADER_TYPE_VERTEX, "cbInlinePositions", PosType, SHADER_VARIABLE_FLAG_INLINE_CONSTANTS)
-                .AddVariable(SHADER_TYPE_VERTEX, "cbInlineColors", ColType, SHADER_VARIABLE_FLAG_INLINE_CONSTANTS);
+                .AddVariable(SHADER_TYPE_VS_PS, "cbInlineColors", ColType, SHADER_VARIABLE_FLAG_INLINE_CONSTANTS);
 
             PsoCI
                 .AddRenderTarget(pSwapChain->GetDesc().ColorBufferFormat)
@@ -294,10 +315,6 @@ void InlineConstants::TestSignatures(Uint32 NumSignatures)
     IRenderDevice*         pDevice    = pEnv->GetDevice();
     IDeviceContext*        pContext   = pEnv->GetDeviceContext();
     ISwapChain*            pSwapChain = pEnv->GetSwapChain();
-    if (pDevice->GetDeviceInfo().Type != RENDER_DEVICE_TYPE_D3D12)
-    {
-        GTEST_SKIP();
-    }
 
     RefCntAutoPtr<IBuffer> pConstBuffer = pEnv->CreateBuffer({"InlineConstants - dummy const buffer", 256, BIND_UNIFORM_BUFFER});
     ASSERT_TRUE(pConstBuffer);
@@ -347,7 +364,7 @@ void InlineConstants::TestSignatures(Uint32 NumSignatures)
                 .AddResource(SHADER_TYPE_VERTEX, "tex1_mut", SHADER_RESOURCE_TYPE_TEXTURE_SRV, SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE)
                 .AddResource(SHADER_TYPE_VERTEX, "tex1_dyn", SHADER_RESOURCE_TYPE_TEXTURE_SRV, SHADER_RESOURCE_VARIABLE_TYPE_DYNAMIC)
 
-                .AddResource(SHADER_TYPE_VERTEX, "cbInlineColors", kNumColConstants, SHADER_RESOURCE_TYPE_CONSTANT_BUFFER, ColType, PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
+                .AddResource(SHADER_TYPE_VS_PS, "cbInlineColors", kNumColConstants, SHADER_RESOURCE_TYPE_CONSTANT_BUFFER, ColType, PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS)
 
                 .AddResource(SHADER_TYPE_VERTEX, "cb2_stat", 1u, SHADER_RESOURCE_TYPE_CONSTANT_BUFFER, SHADER_RESOURCE_VARIABLE_TYPE_STATIC)
                 .AddResource(SHADER_TYPE_VERTEX, "cb2_mut", 1u, SHADER_RESOURCE_TYPE_CONSTANT_BUFFER, SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE)
@@ -567,7 +584,7 @@ void CreateShadersFromCache(IRenderStateCache* pCache, bool PresentInCache, ISha
     {
         ShaderCI.Desc       = {"Inline constants test", SHADER_TYPE_PIXEL, true};
         ShaderCI.EntryPoint = "main";
-        ShaderCI.Source     = HLSL::DrawTest_PS.c_str();
+        ShaderCI.Source     = HLSL::InlineConstantsTest_PS.c_str();
         if (pCache != nullptr)
         {
             EXPECT_EQ(pCache->CreateShader(ShaderCI, ppPS), PresentInCache);
@@ -599,7 +616,7 @@ void CreatePSOFromCache(IRenderStateCache* pCache, bool PresentInCache, IShader*
     static ShaderResourceVariableDesc Vars[] =
         {
             {SHADER_TYPE_VERTEX, "cbInlinePositions", SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE, SHADER_VARIABLE_FLAG_INLINE_CONSTANTS},
-            {SHADER_TYPE_VERTEX, "cbInlineColors", SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE, SHADER_VARIABLE_FLAG_INLINE_CONSTANTS},
+            {SHADER_TYPE_VS_PS, "cbInlineColors", SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE, SHADER_VARIABLE_FLAG_INLINE_CONSTANTS},
         };
     PsoCI.PSODesc.ResourceLayout.Variables    = Vars;
     PsoCI.PSODesc.ResourceLayout.NumVariables = _countof(Vars);
@@ -667,11 +684,6 @@ TEST_F(InlineConstants, RenderStateCache)
     GPUTestingEnvironment* pEnv    = GPUTestingEnvironment::GetInstance();
     IRenderDevice*         pDevice = pEnv->GetDevice();
 
-    if (pDevice->GetDeviceInfo().Type != RENDER_DEVICE_TYPE_D3D12)
-    {
-        GTEST_SKIP();
-    }
-
     GPUTestingEnvironment::ScopedReset AutoReset;
 
     RefCntAutoPtr<IShaderSourceInputStreamFactory> pShaderSourceFactory;