Fix for #895 - physical_device_groups testing

For 1.1 version instances we do not require physical devices groups extension to be supported. Instead on 1.1 instances we just assume it's now a part of core implementation.

Components: Vulkan

VK-GL-CTS issue: 895

Affects: All tests using createInstanceWithExtension function

Change-Id: Ib11999498c28156e1e5d0c5e9025cb6ca4ba75a0

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 171f4b2..2eab5bb 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -597,10 +597,13 @@ Move<VkInstance> createInstanceWithExtension (const PlatformInterface& vkp, deUi
        const vector<VkExtensionProperties>     instanceExts = enumerateInstanceExtensionProperties(vkp, DE_NULL);
        vector<string>                                          enabledExts;
 
-       if (!isExtensionSupported(instanceExts, RequiredExtension(extensionName)))
-               TCU_THROW(NotSupportedError, (string(extensionName) + " is not supported").c_str());
-
-       enabledExts.push_back(extensionName);
+       if (!isCoreInstanceExtension(version, extensionName))
+       {
+               if (!isExtensionSupported(instanceExts, RequiredExtension(extensionName)))
+                       TCU_THROW(NotSupportedError, (string(extensionName) + " is not supported").c_str());
+               else
+                       enabledExts.push_back(extensionName);
+       }
 
        return createDefaultInstance(vkp, version, vector<string>() /* layers */, enabledExts, DE_NULL);
 }