Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I9c4fcecb9fb7199d858ca22002247820388eece1

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.hpp
index 08a083e,d7ccd2b..87aca75
--- 1/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.hpp
--- 2/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.hpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.hpp
@@@ -115,26 -115,6 +115,25 @@@ std::string getFormatNameForGLSL(vk::Vk
  void addGeometryShadersFromTemplate (const std::string& glslTemplate, const vk::ShaderBuildOptions& options, vk::GlslSourceCollection& collection);
  void addGeometryShadersFromTemplate (const std::string& spirvTemplate, const vk::SpirVAsmBuildOptions& options, vk::SpirVAsmCollection& collection);
  
- 
 +void setVertexShaderFrameBuffer (vk::SourceCollections& programCollection);
 +
 +void setFragmentShaderFrameBuffer (vk::SourceCollections& programCollection);
 +
 +void setFragmentShaderFrameBuffer (vk::SourceCollections& programCollection);
 +
 +void setTesCtrlShaderFrameBuffer (vk::SourceCollections& programCollection);
 +
 +void setTesEvalShaderFrameBuffer (vk::SourceCollections& programCollection);
 +
 +tcu::TestStatus makeTessellationEvaluationFrameBufferTest(Context& context, vk::VkFormat format,
 +      SSBOData* extraData, deUint32 extraDataCount,
 +      bool (*checkResult)(std::vector<const void*> datas, deUint32 width, deUint32 subgroupSize),
 +      const vk::VkShaderStageFlags shaderStage = vk::VK_SHADER_STAGE_ALL_GRAPHICS);
 +
 +tcu::TestStatus makeGeometryFrameBufferTest(Context& context, vk::VkFormat format, SSBOData* extraData,
 +      deUint32 extraDataCount,
 +      bool (*checkResult)(std::vector<const void*> datas, deUint32 width, deUint32 subgroupSize));
 +
  tcu::TestStatus allStages(Context& context, vk::VkFormat format,
        SSBOData* extraData, deUint32 extraDataCount,
        bool (*checkResult)(std::vector<const void*> datas, deUint32 width, deUint32 subgroupSize),