commit 2605cb05ec149b2e2668540501dc79c71b6a67e9
author Cody Northrop <cody@lunarg.com> Tue Aug 18 15:21:16 2015 -0600
committer Cody Northrop <cody@lunarg.com> Wed Aug 26 09:59:59 2015 -0600
tree e624fe6599d94688b743245ec2077c2a31f58761
parent af79f6ae6256531fd326b7654b4367a99a608f07

Bug 14406: Add support for front/back stencil reference dynamic state

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 46dd4d4..20e364c 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -31,7 +31,8 @@
     BsoFailRasterDepthBias          = 0x00000002,
     BsoFailViewport                 = 0x00000004,
     BsoFailColorBlend               = 0x00000008,
-    BsoFailDepthStencil             = 0x00000010,
+    BsoFailDepth                    = 0x00000010,
+    BsoFailStencil                  = 0x00000020,
 } BsoFailSelect;
 
 struct vktriangle_vs_uniform {
@@ -320,10 +321,14 @@
     if ((failMask & BsoFailColorBlend) != BsoFailColorBlend) {
         cmdBuffer->BindDynamicColorBlendState(m_colorBlend);
     }
-    if ((failMask & BsoFailDepthStencil) != BsoFailDepthStencil) {
-        cmdBuffer->BindDynamicDepthStencilState(m_stateDepthStencil);
+    if ((failMask & BsoFailDepth) != BsoFailDepth) {
+        cmdBuffer->BindDynamicDepthState(m_stateDepth);
     }
-    // Make sure depthWriteEnable is set so that DepthStencil fail test will work correctly
+    if ((failMask & BsoFailStencil) != BsoFailStencil) {
+        cmdBuffer->BindDynamicStencilState(m_stateStencil);
+    }
+    // Make sure depthWriteEnable is set so that Depth fail test will work correctly
+    // Make sure stencilTestEnable is set so that Stencil fail test will work correctly
     VkStencilOpState stencil = {};
     stencil.stencilFailOp = VK_STENCIL_OP_KEEP;
         stencil.stencilPassOp = VK_STENCIL_OP_KEEP;
@@ -337,7 +342,7 @@
         ds_ci.depthWriteEnable = VK_TRUE;
         ds_ci.depthCompareOp = VK_COMPARE_OP_NEVER;
         ds_ci.depthBoundsEnable = VK_FALSE;
-        ds_ci.stencilTestEnable = VK_FALSE;
+        ds_ci.stencilTestEnable = VK_TRUE;
         ds_ci.front = stencil;
         ds_ci.back = stencil;
 
@@ -966,20 +971,37 @@
     }
 }
 
-TEST_F(VkLayerTest, DepthStencilStateNotBound)
+TEST_F(VkLayerTest, DepthStateNotBound)
 {
     VkFlags msgFlags;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
     m_errorMonitor->ClearState();
-    TEST_DESCRIPTION("Simple Draw Call that validates failure when a depth-stencil state object is not bound beforehand");
+    TEST_DESCRIPTION("Simple Draw Call that validates failure when a depth state object is not bound beforehand");
 
-    VKTriangleTest(bindStateVertShaderText, bindStateFragShaderText, BsoFailDepthStencil);
+    VKTriangleTest(bindStateVertShaderText, bindStateFragShaderText, BsoFailDepth);
 
     msgFlags = m_errorMonitor->GetState(&msgString);
-    ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive an error from Not Binding a DepthStencil State Object";
-    if (!strstr(msgString.c_str(),"Depth-stencil object not bound to this command buffer")) {
-        FAIL() << "Error received was not 'Depth-stencil object not bound to this command buffer'";
+    ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive an error from Not Binding a Depth State Object";
+    if (!strstr(msgString.c_str(),"Depth object not bound to this command buffer")) {
+        FAIL() << "Error received was not 'Depth object not bound to this command buffer'";
+    }
+}
+
+TEST_F(VkLayerTest, StencilStateNotBound)
+{
+    VkFlags msgFlags;
+    std::string msgString;
+    ASSERT_NO_FATAL_FAILURE(InitState());
+    m_errorMonitor->ClearState();
+    TEST_DESCRIPTION("Simple Draw Call that validates failure when a stencil state object is not bound beforehand");
+
+    VKTriangleTest(bindStateVertShaderText, bindStateFragShaderText, BsoFailStencil);
+
+    msgFlags = m_errorMonitor->GetState(&msgString);
+    ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive an error from Not Binding a Stencil State Object";
+    if (!strstr(msgString.c_str(),"Stencil object not bound to this command buffer")) {
+        FAIL() << "Error received was not 'Stencil object not bound to this command buffer'";
     }
 }
 #endif