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

Change-Id: I65c0b8f7c257881f2d559c91b4944fafa7664f99

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index b39d230,befe86a..45fb42e
--- 1/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
--- 2/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),