Merge vk-gkl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / wsi / vktWsiSurfaceTests.cpp

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
index 046b2c0..2501d39 100644 (file)
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
@@ -238,7 +238,8 @@ MovePtr<Display> createDisplay (const vk::Platform& platform,
        }
        catch (const tcu::NotSupportedError& e)
        {
-               if (isExtensionSupported(supportedExtensions, RequiredExtension(getExtensionName(wsiType))))
+               if (isExtensionSupported(supportedExtensions, RequiredExtension(getExtensionName(wsiType))) &&
+                   platform.hasDisplay(wsiType))
                {
                        // If VK_KHR_{platform}_surface was supported, vk::Platform implementation
                        // must support creating native display & window for that WSI type.