commit e06ba258ad0785aaf6727ba7dc709c7d17ae2f89
author Chris Forbes <chrisforbes@google.com> Fri Sep 16 17:48:53 2016 +1200
committer Chris Forbes <chrisforbes@google.com> Mon Sep 19 08:54:42 2016 +1200
tree 092d9d22a0cdc45ba92f9c6221a73b52fa435bd2
parent 8d260dd2cc5d36c70932c9958dae84e027cc2700

tests: Partially fix VkLayerTest.InvalidCmdBufferPipelineDestroyed

- If there is no dynamic state, MUST NOT provide the struct
  (dynamicStateCount==0 is not allowed).
- Set a real line width. This was being left at 0, which is outside
  device limits.
- Disable rasterization since we don't need it, to avoid needing to
  populate even more structures.

Signed-off-by: Chris Forbes <chrisforbes@google.com>

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index e1c1346..bee23b0 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -7069,9 +7069,6 @@
     vp_state_ci.scissorCount = 1;
     VkRect2D scissors = {}; // Dummy scissors to point to
     vp_state_ci.pScissors = &scissors;
-    // No dynamic state
-    VkPipelineDynamicStateCreateInfo dyn_state_ci = {};
-    dyn_state_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
 
     VkPipelineShaderStageCreateInfo shaderStages[2];
     memset(&shaderStages, 0, 2 * sizeof(VkPipelineShaderStageCreateInfo));
@@ -7091,6 +7088,8 @@
 
     VkPipelineRasterizationStateCreateInfo rs_ci = {};
     rs_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
+    rs_ci.rasterizerDiscardEnable = true;
+    rs_ci.lineWidth = 1.0f;
 
     VkPipelineColorBlendAttachmentState att = {};
     att.blendEnable = VK_FALSE;
@@ -7110,7 +7109,6 @@
     gp_ci.pViewportState = &vp_state_ci;
     gp_ci.pRasterizationState = &rs_ci;
     gp_ci.pColorBlendState = &cb_ci;
-    gp_ci.pDynamicState = &dyn_state_ci;
     gp_ci.flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT;
     gp_ci.layout = pipeline_layout;
     gp_ci.renderPass = renderPass();