Merge 78-multisample-tests

Change-Id: I0d2a4fdb49a34bfe3657f52b8e82f111061227e1

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

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.hpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
index 9bdb92b,66b0863..106c657
--- 1/external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
--- 2/external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp
@@@ -40,7 -40,7 +40,8 @@@
  #include "vktPipelineImageTests.hpp"
  #include "vktPipelineSamplerTests.hpp"
  #include "vktPipelineImageViewTests.hpp"
 +#include "vktPipelinePushConstantTests.hpp"
+ #include "vktPipelineMultisampleTests.hpp"
  #include "deUniquePtr.hpp"
  
  namespace vkt
@@@ -52,13 -52,13 +53,14 @@@ 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(createPushConstantTests(testCtx));
 -      pipelineTests->addChild(createMultisampleTests(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));
  
        return pipelineTests.release();
  }