Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5

Change-Id: I00f17a688d8b0b2e6c13cab41f9db2f1f853ec8b

diff --cc external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp
index 3fb6221,08f35b2..811e4c9
--- 1/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp
--- 2/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp
+++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp
@@@ -1012,12 -957,22 +1012,25 @@@ void VertexShaderTestInstance::createPi
        const DeviceInterface&  vk              = m_context.getDeviceInterface();
        const VkDevice                  device  = m_context.getDevice();
  
+       switch (m_parametersGraphic.primitiveTopology)
+       {
+               case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY:
+               case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY:
+               case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY:
+               case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY:
+                       if (!m_context.getDeviceFeatures().geometryShader)
+                               throw tcu::NotSupportedError("Geometry shader are not supported");
+                       break;
+               default:
+                       break;
+       }
+ 
        // Pipeline
 -      Unique<VkShaderModule> vs(createShaderModule(vk, device, m_context.getBinaryCollection().get("vertex"), 0));
 -      Unique<VkShaderModule> fs(createShaderModule(vk, device, m_context.getBinaryCollection().get("fragment"), 0));
 +      Unique<VkShaderModule>  vs(createShaderModule(vk, device, m_context.getBinaryCollection().get("vertex"), 0));
 +      Move<VkShaderModule>    fs;
 +
 +      if (!m_parametersGraphic.vertexOnlyPipe)
 +              fs = createShaderModule(vk, device, m_context.getBinaryCollection().get("fragment"), 0);
  
        const PipelineCreateInfo::ColorBlendState::Attachment attachmentState;
  

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge