From: Alexander Galazin <alexander.galazin@arm.com>
Date: Thu, 25 Oct 2018 13:27:17 +0000 (+0200)
Subject: Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
X-Git-Tag: upstream/1.3.5~1527^2~219
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b162908e1168e5e9fb55763af83bce59d0240d3;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ie615d2294ca51629dd202087883acee9b0791f51
---

4b162908e1168e5e9fb55763af83bce59d0240d3
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 8c03cd5,510df2b..9cac520
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@@ -769,9 -768,9 +769,10 @@@ void checkDeviceExtensions (tcu::Result
  		"VK_KHR_draw_indirect_count",
  		"VK_KHR_create_renderpass2",
  		"VK_KHR_driver_properties",
 +		"VK_KHR_swapchain_mutable_format",
  		"VK_KHR_shader_atomic_int64",
  		"VK_KHR_vulkan_memory_model",
+ 		"VK_KHR_swapchain_mutable_format",
  	};
  
  	checkKhrExtensions(results, extensions, DE_LENGTH_OF_ARRAY(s_allowedDeviceKhrExtensions), s_allowedDeviceKhrExtensions);