From: Alexander Galazin <alexander.galazin@arm.com>
Date: Tue, 3 Oct 2017 11:48:02 +0000 (+0200)
Subject: Fix extensions checks in WSI tests
X-Git-Tag: upstream/1.3.5~2565^2~6^2~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1c2646504858f1b0aae28e460f8343fc04efe40;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix extensions checks in WSI tests

Components: Vulkan

Affects:
dEQP-VK.wsi.*

VK-GL-CTS issue: 730

Change-Id: I217daf260f4110712c1636cf0278846e082a52ca
---

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
index de164f3..ec43b46 100644
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
@@ -176,23 +176,25 @@ Move<VkInstance> createInstanceWithWsi (const PlatformInterface&		vkp,
 										const vector<string>			extraExtensions,
 										const VkAllocationCallbacks*	pAllocator	= DE_NULL)
 {
-	vector<string>	extensions;
+	vector<string>	extensions = extraExtensions;
 
 	extensions.push_back("VK_KHR_surface");
 	extensions.push_back(getExtensionName(wsiType));
 
-	for (vector<string>::const_iterator extraExtensionsName = extraExtensions.begin();
-	extraExtensionsName != extraExtensions.end();
-	++extraExtensionsName)
+	vector<string>	instanceExtensions;
+
+	for (vector<string>::const_iterator extensionName = extensions.begin();
+		 extensionName != extensions.end();
+		 ++extensionName)
 	{
-		if (!isInstanceExtensionSupported(version, supportedExtensions, RequiredExtension(*extraExtensionsName)))
-			TCU_THROW(NotSupportedError, (*extraExtensionsName + " is not supported").c_str());
+		if (!isInstanceExtensionSupported(version, supportedExtensions, RequiredExtension(*extensionName)))
+			TCU_THROW(NotSupportedError, (*extensionName + " is not supported").c_str());
 
-		if (!isCoreInstanceExtension(version, *extraExtensionsName))
-			extensions.push_back(*extraExtensionsName);
+		if (!isCoreInstanceExtension(version, *extensionName))
+			instanceExtensions.push_back(*extensionName);
 	}
 
-	return vk::createDefaultInstance(vkp, version, vector<string>(), extensions, pAllocator);
+	return vk::createDefaultInstance(vkp, version, vector<string>(), instanceExtensions, pAllocator);
 }
 
 struct InstanceHelper