From 61462a9c4091bb02bcfedad6e75edf5ddaaeb7a3 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 4 Mar 2019 19:28:17 -0800 Subject: Updated Shader res layout & shader var access tests --- Tests/TestApp/src/TestShaderResourceLayout.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Tests/TestApp/src/TestShaderResourceLayout.cpp') diff --git a/Tests/TestApp/src/TestShaderResourceLayout.cpp b/Tests/TestApp/src/TestShaderResourceLayout.cpp index 35fa659..2578f40 100644 --- a/Tests/TestApp/src/TestShaderResourceLayout.cpp +++ b/Tests/TestApp/src/TestShaderResourceLayout.cpp @@ -261,7 +261,10 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev PSODesc.SRBAllocationGranularity = 16; RefCntAutoPtr pTestPSO; + LOG_INFO_MESSAGE("The 2 warnings below about missing shader resources are part of the test"); pDevice->CreatePipelineState(PSODesc, &pTestPSO); + + VERIFY_EXPR(pTestPSO); { @@ -278,7 +281,9 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev pTestPSO->GetStaticShaderVariable(SHADER_TYPE_VERTEX, "g_UniformTexelBuff")->Set(pUniformTexelBuffSRV); pTestPSO->GetStaticShaderVariable(SHADER_TYPE_VERTEX, "g_StorageTexelBuff")->Set(pStorageTexelBuffUAV); pTestPSO->GetStaticShaderVariable(SHADER_TYPE_VERTEX, "g_tex2D_Mut"); - LOG_INFO_MESSAGE("The above 2 warnings and 1 errors about missing shader resources are part of the test"); + auto* pStaticSam = pTestPSO->GetStaticShaderVariable(SHADER_TYPE_VERTEX, "g_Sam_static"); + VERIFY_EXPR(pStaticSam == nullptr); + auto NumVSVars = pTestPSO->GetStaticVariableCount(SHADER_TYPE_VERTEX); for(Uint32 v=0; v < NumVSVars; ++v) @@ -305,7 +310,9 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev pTestPSO->GetStaticShaderVariable(SHADER_TYPE_PIXEL, "g_UniformTexelBuff")->Set(pUniformTexelBuffSRV); pTestPSO->GetStaticShaderVariable(SHADER_TYPE_PIXEL, "g_StorageTexelBuff")->Set(pStorageTexelBuffUAV); pTestPSO->GetStaticShaderVariable(SHADER_TYPE_PIXEL, "storageBuff_Dyn"); - LOG_INFO_MESSAGE("The above 2 warnings and 1 errors about missing shader resources are part of the test"); + auto* pStaticSam = pTestPSO->GetStaticShaderVariable(SHADER_TYPE_PIXEL, "g_Sam_static"); + VERIFY_EXPR(pStaticSam == nullptr); + auto NumPSVars = pTestPSO->GetStaticVariableCount(SHADER_TYPE_PIXEL); for(Uint32 v=0; v < NumPSVars; ++v) -- cgit v1.2.3