From 81f6db0230eee1498e5ef6970866f4da2e5ba093 Mon Sep 17 00:00:00 2001 From: Liam Middlebrook Date: Mon, 17 Dec 2018 22:04:29 -0800 Subject: [PATCH] Don't fail DisplayProperties2KHR with no display Instead, we should mark this test as not supported. VK-GL-CTS issue: 1527 Components: Vulkan Change-Id: I3b23ee27b6095b9dd1a4cdec01f0b92046aa8bc5 Affects: dEQP-VK.wsi.display.get_display_properties2 --- external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp index 849e9e1..16fa88f 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp @@ -1682,7 +1682,6 @@ tcu::TestStatus DisplayCoverageTestInstance::testCreateDisplayPlaneSurfaceKHR (v /*--------------------------------------------------------------------*//*! * \brief Display enumeration coverage test using VK_KHR_get_display_properties2 * - * Throws ResourceError exception in case no displays available. * Throws an exception on fail. * * \return tcu::TestStatus::pass on success @@ -1711,7 +1710,7 @@ tcu::TestStatus DisplayCoverageTestInstance::testGetPhysicalDeviceDisplayPropert TCU_FAIL_STR(string("Expected VK_SUCCESS. Have ") + getResultAsString(result)); if (displayCountReported == 0) - TCU_THROW(ResourceError, std::string("Cannot perform test: no displays found").c_str()); + TCU_THROW(NotSupportedError, std::string("Cannot perform test: no displays found").c_str()); displayCountToTest = displayCountReported; if (displayCountReported > MAX_TESTED_DISPLAY_COUNT) -- 2.7.4