commit f5bd2253ff4114ac446f8eb820e78d56f711020f
author Cody Northrop <cody@lunarg.com> Mon Aug 17 11:10:49 2015 -0600
committer Cody Northrop <cody@lunarg.com> Wed Aug 26 09:59:59 2015 -0600
tree e71e8887e6f9a10717bb33734cf2a259251acd81
parent 10442c1f0417f4a2458c959fcf2e4706f5013771

Bug 14323: RasterLine and RasterDepthBias changes

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 6ece510..46dd4d4 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -27,10 +27,11 @@
 
 typedef enum _BsoFailSelect {
     BsoFailNone                     = 0x00000000,
-    BsoFailRaster                   = 0x00000001,
-    BsoFailViewport                 = 0x00000002,
-    BsoFailColorBlend               = 0x00000004,
-    BsoFailDepthStencil             = 0x00000008,
+    BsoFailRasterLine               = 0x00000001,
+    BsoFailRasterDepthBias          = 0x00000002,
+    BsoFailViewport                 = 0x00000004,
+    BsoFailColorBlend               = 0x00000008,
+    BsoFailDepthStencil             = 0x00000010,
 } BsoFailSelect;
 
 struct vktriangle_vs_uniform {
@@ -307,8 +308,11 @@
     }
 
     cmdBuffer->PrepareAttachments();
-    if ((failMask & BsoFailRaster) != BsoFailRaster) {
-        cmdBuffer->BindDynamicRasterState(m_stateRaster);
+    if ((failMask & BsoFailRasterLine) != BsoFailRasterLine) {
+        cmdBuffer->BindDynamicRasterLineState(m_stateRasterLine);
+    }
+    if ((failMask & BsoFailRasterDepthBias) != BsoFailRasterDepthBias) {
+        cmdBuffer->BindDynamicRasterDepthBiasState(m_stateRasterDepthBias);
     }
     if ((failMask & BsoFailViewport) != BsoFailViewport) {
         cmdBuffer->BindDynamicViewportState(m_stateViewport);
@@ -894,20 +898,37 @@
 #endif
 #endif
 #if OBJ_TRACKER_TESTS
-TEST_F(VkLayerTest, RasterStateNotBound)
+TEST_F(VkLayerTest, RasterLineStateNotBound)
 {
     VkFlags msgFlags;
     std::string msgString;
     ASSERT_NO_FATAL_FAILURE(InitState());
     m_errorMonitor->ClearState();
-    TEST_DESCRIPTION("Simple Draw Call that validates failure when a raster state object is not bound beforehand");
+    TEST_DESCRIPTION("Simple Draw Call that validates failure when a raster line state object is not bound beforehand");
 
-    VKTriangleTest(bindStateVertShaderText, bindStateFragShaderText, BsoFailRaster);
+    VKTriangleTest(bindStateVertShaderText, bindStateFragShaderText, BsoFailRasterLine);
 
     msgFlags = m_errorMonitor->GetState(&msgString);
-    ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive an error from Not Binding a Raster State Object";
-    if (!strstr(msgString.c_str(),"Raster object not bound to this command buffer")) {
-        FAIL() << "Error received was not 'Raster 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 Raster Line State Object";
+    if (!strstr(msgString.c_str(),"Raster line object not bound to this command buffer")) {
+        FAIL() << "Error received was not 'Raster line object not bound to this command buffer'";
+    }
+}
+
+TEST_F(VkLayerTest, RasterDepthBiasStateNotBound)
+{
+    VkFlags msgFlags;
+    std::string msgString;
+    ASSERT_NO_FATAL_FAILURE(InitState());
+    m_errorMonitor->ClearState();
+    TEST_DESCRIPTION("Simple Draw Call that validates failure when a raster depth bias state object is not bound beforehand");
+
+    VKTriangleTest(bindStateVertShaderText, bindStateFragShaderText, BsoFailRasterDepthBias);
+
+    msgFlags = m_errorMonitor->GetState(&msgString);
+    ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive an error from Not Binding a Raster Depth Bias State Object";
+    if (!strstr(msgString.c_str(),"Raster depth bias object not bound to this command buffer")) {
+        FAIL() << "Error received was not 'Raster depth bias object not bound to this command buffer'";
     }
 }