Merge vk-gl-cts/vulkan-cts-1.3.10 into vk-gl-cts/vulkan-cts-1.4.0

Change-Id: I4ee3f6eb42f992130cc38730043e94839d411d30
diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp
index cc876a6..2f763d0 100644
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp
@@ -1137,9 +1137,10 @@
     VK_CHECK(
         instHelper.vki.getPhysicalDeviceSurfaceCapabilities2KHR(devHelper.physicalDevice, &surfaceInfo, &capabilities));
 
-    // The return value must be at least one, as every mode is compatible with itself.
+    // Sometime ICD selected will not support the instance extensions got in enumerateInstanceExtensionProperties.
+    // In this case the struct varible compatibility queried in getPhysicalDeviceSurfaceCapabilities2KHR will keep unchanged.
     if (compatibility.presentModeCount < 1)
-        return tcu::TestStatus::fail("Empty compatible present mode list");
+        TCU_THROW(NotSupportedError, "Empty compatible present mode list, VK_EXT_surface_maintenance1 not supported.");
 
     // Test again providing a buffer that's too small
     constexpr VkPresentModeKHR invalidValue = (VkPresentModeKHR)0x1234;