From: Matthew Netsch <quic_mnetsch@quicinc.com>
Date: Fri, 5 Nov 2021 14:51:30 +0000 (-0400)
Subject: Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.3.0
X-Git-Tag: upstream/1.3.5~332^2~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5068e3ae53710c16de10404cb7427024700ae7cf;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.3.0

Change-Id: Ia059b652611b41999709074e2c9e3830ef6fac1f
---

5068e3ae53710c16de10404cb7427024700ae7cf
diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index 67e7270,257b7de..1ca78b2
--- a/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@@ -49,7 -49,7 +49,8 @@@ enum TestTyp
  
  static const VkConformanceVersionKHR knownConformanceVersions[] =
  {
 +	makeConformanceVersion(1, 3, 0, 0),
+ 	makeConformanceVersion(1, 2, 7, 2),
  	makeConformanceVersion(1, 2, 7, 1),
  	makeConformanceVersion(1, 2, 7, 0),
  	makeConformanceVersion(1, 2, 6, 2),