From: Alexander Galazin <alexander.galazin@arm.com>
Date: Thu, 10 Sep 2020 16:25:52 +0000 (+0200)
Subject: Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3
X-Git-Tag: upstream/1.3.5~1126^2~2^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=305a35353cf60ba66284e9def0c068e3d4eb1328;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/vulkan-cts-1.2.3

Change-Id: I65c0b8f7c257881f2d559c91b4944fafa7664f99
---

305a35353cf60ba66284e9def0c068e3d4eb1328
diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index b39d230,befe86a..45fb42e
--- a/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@@ -65,11 -65,10 +65,13 @@@ static const deUint32 knownDriverIds[] 
  
  static const VkConformanceVersionKHR knownConformanceVersions[] =
  {
 +	makeConformanceVersion(1, 2, 3, 2),
 +	makeConformanceVersion(1, 2, 3, 1),
 +	makeConformanceVersion(1, 2, 3, 0),
+ 	makeConformanceVersion(1, 2, 2, 2),
  	makeConformanceVersion(1, 2, 2, 1),
  	makeConformanceVersion(1, 2, 2, 0),
+ 	makeConformanceVersion(1, 2, 1, 2),
  	makeConformanceVersion(1, 2, 1, 1),
  	makeConformanceVersion(1, 2, 1, 0),
  	makeConformanceVersion(1, 2, 0, 2),