Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: I02ba5bcb0273934d93d91e2375f9d272c6c69904

diff --cc external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleInterpolationTests.cpp
index 71b4c3c,dc09eeb..7de42db
--- 1/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleInterpolationTests.cpp
--- 2/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleInterpolationTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleInterpolationTests.cpp
@@@ -225,14 -897,32 +225,16 @@@ template<> void MSCase<MSCaseSampleQual
        programCollection.glslSources.add("fragment_shader") << glu::FragmentSource(fs.str());
  }
  
 -TestInstance* MSCaseSampleQualifierDistinctValues::createInstance (Context& context) const
 +template<> TestInstance* MSCase<MSCaseSampleQualifierDistinctValues>::createInstance (Context& context) const
  {
 -      return new MSInstanceDistinctValues(context, m_imageMSParams);
+       if (!context.getDeviceFeatures().sampleRateShading)
+               TCU_THROW(NotSupportedError, "sampleRateShading support required");
 +      return new MSInstance<MSInstanceDistinctValues>(context, m_imageMSParams);
  }
  
 -class MSCaseInterpolateAtSampleDistinctValues : public MSInterpolationCaseBase
 -{
 -public:
 -                                      MSCaseInterpolateAtSampleDistinctValues (tcu::TestContext&              testCtx,
 -                                                                                                                       const std::string&             name,
 -                                                                                                                       const ImageMSParams&   imageMSParams)
 -      : MSInterpolationCaseBase(testCtx, name, imageMSParams) {}
 -
 -      void                    init                                                                    (void);
 -      void                    initPrograms                                                    (vk::SourceCollections& programCollection) const;
 -      TestInstance*   createInstance                                                  (Context&                               context) const;
 -};
 -
 -MSInterpolationCaseBase* createMSCaseInterpolateAtSampleDistinctValues (tcu::TestContext& testCtx, const std::string& name, const ImageMSParams& imageMSParams)
 -{
 -      return new MSCaseInterpolateAtSampleDistinctValues(testCtx, name, imageMSParams);
 -}
 +class MSCaseInterpolateAtSampleDistinctValues;
  
 -void MSCaseInterpolateAtSampleDistinctValues::init (void)
 +template<> void MSCase<MSCaseInterpolateAtSampleDistinctValues>::init (void)
  {
        m_testCtx.getLog()
                << tcu::TestLog::Message