Merge 30-vertex-input-tests

Change-Id: Ieae77cd894e451a3adc3c5ad1ac30cb6ed3beb84

diff --cc external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
index bf8f66f,317df3c..1cba488
--- 1/external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
--- 2/external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
@@@ -38,11 -38,9 +38,12 @@@
  #include "vktPipelineBlendTests.hpp"
  #include "vktPipelineDepthTests.hpp"
  #include "vktPipelineImageTests.hpp"
 +#include "vktPipelineInputAssemblyTests.hpp"
  #include "vktPipelineSamplerTests.hpp"
  #include "vktPipelineImageViewTests.hpp"
 +#include "vktPipelinePushConstantTests.hpp"
 +#include "vktPipelineMultisampleTests.hpp"
+ #include "vktPipelineVertexInputTests.hpp"
  #include "deUniquePtr.hpp"
  
  namespace vkt
@@@ -54,15 -52,13 +55,16 @@@ tcu::TestCaseGroup* createTests (tcu::T
  {
        de::MovePtr<tcu::TestCaseGroup> pipelineTests (new tcu::TestCaseGroup(testCtx, "pipeline", "Pipeline Tests"));
  
 -      pipelineTests->addChild(createStencilTests(testCtx));
 -      pipelineTests->addChild(createBlendTests(testCtx));
 -      pipelineTests->addChild(createDepthTests(testCtx));
 -      pipelineTests->addChild(createImageTests(testCtx));
 -      pipelineTests->addChild(createSamplerTests(testCtx));
 -      pipelineTests->addChild(createImageViewTests(testCtx));
 -      pipelineTests->addChild(createVertexInputTests(testCtx));
 +      pipelineTests->addChild(createStencilTests              (testCtx));
 +      pipelineTests->addChild(createBlendTests                (testCtx));
 +      pipelineTests->addChild(createDepthTests                (testCtx));
 +      pipelineTests->addChild(createImageTests                (testCtx));
 +      pipelineTests->addChild(createSamplerTests              (testCtx));
 +      pipelineTests->addChild(createImageViewTests    (testCtx));
 +      pipelineTests->addChild(createPushConstantTests (testCtx));
 +      pipelineTests->addChild(createMultisampleTests  (testCtx));
++      pipelineTests->addChild(createVertexInputTests  (testCtx));
 +      pipelineTests->addChild(createInputAssemblyTests(testCtx));
  
        return pipelineTests.release();
  }