commit 510aa5c646f786bba96b7879d78d9bb47b6c67ba
author Mark Lobodzinski <mark@lunarg.com> Mon Dec 19 07:59:10 2016 -0700
committer Mark Lobodzinski <mark@lunarg.com> Mon Dec 19 13:35:45 2016 -0700
tree 0b4fba705b40e3b750f29e9865854b9675c4e455
parent d40eeb11ab29f99cc9cc068333808e6d204ba2d7

tests: Rename scissor/vp count test and fix errors

Renamed test to add additional validatin checks, fixed an
unexpected error in test.

Change-Id: I013102f716795713ea2597cd5e54a79346eada29

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index f628d8e..88eacb4 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -7129,10 +7129,10 @@
 }
 */
 
-TEST_F(VkLayerTest, PSOViewportScissorCountMismatch) {
+TEST_F(VkLayerTest, PSOViewportScissorCountTests) {
     VkResult err;
 
-    TEST_DESCRIPTION("Set scissor and viewport counts to different numbers");
+    TEST_DESCRIPTION("Test various cases of viewport and scissor count validation");
 
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_01434);
 
@@ -7190,9 +7190,9 @@
 
     VkPipelineViewportStateCreateInfo vp_state_ci = {};
     vp_state_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
-    vp_state_ci.scissorCount = 0;
+    vp_state_ci.scissorCount = 1;
     // Count mismatch should cause error
-    vp_state_ci.viewportCount = 1;
+    vp_state_ci.viewportCount = 2;
     vp_state_ci.pViewports = &vp;
 
     VkPipelineRasterizationStateCreateInfo rs_state_ci = {};