Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: Idcd78cbc60325522a070c7c777317f0d811377c7

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index fb50a02,f0bba3a..50010cd
--- 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,26 -65,26 +65,27 @@@ static const deUint32 knownDriverIds[] 
  
  static const VkConformanceVersionKHR knownConformanceVersions[] =
  {
 -      makeConformanceVersionKHR(1, 1, 5, 2),
 -      makeConformanceVersionKHR(1, 1, 5, 1),
 -      makeConformanceVersionKHR(1, 1, 5, 0),
 -      makeConformanceVersionKHR(1, 1, 4, 3),
 -      makeConformanceVersionKHR(1, 1, 4, 2),
 -      makeConformanceVersionKHR(1, 1, 4, 1),
 -      makeConformanceVersionKHR(1, 1, 4, 0),
 -      makeConformanceVersionKHR(1, 1, 3, 3),
 -      makeConformanceVersionKHR(1, 1, 3, 2),
 -      makeConformanceVersionKHR(1, 1, 3, 1),
 -      makeConformanceVersionKHR(1, 1, 3, 0),
 -      makeConformanceVersionKHR(1, 1, 2, 3),
 -      makeConformanceVersionKHR(1, 1, 2, 2),
 -      makeConformanceVersionKHR(1, 1, 2, 1),
 -      makeConformanceVersionKHR(1, 1, 2, 0),
 -      makeConformanceVersionKHR(1, 1, 1, 3),
 -      makeConformanceVersionKHR(1, 1, 1, 2),
 -      makeConformanceVersionKHR(1, 1, 1, 1),
 -      makeConformanceVersionKHR(1, 1, 1, 0),
 -      makeConformanceVersionKHR(1, 1, 0, 3),
 +      makeConformanceVersion(1, 2, 0, 0),
++      makeConformanceVersion(1, 1, 5, 2),
 +      makeConformanceVersion(1, 1, 5, 1),
 +      makeConformanceVersion(1, 1, 5, 0),
 +      makeConformanceVersion(1, 1, 4, 3),
 +      makeConformanceVersion(1, 1, 4, 2),
 +      makeConformanceVersion(1, 1, 4, 1),
 +      makeConformanceVersion(1, 1, 4, 0),
 +      makeConformanceVersion(1, 1, 3, 3),
 +      makeConformanceVersion(1, 1, 3, 2),
 +      makeConformanceVersion(1, 1, 3, 1),
 +      makeConformanceVersion(1, 1, 3, 0),
 +      makeConformanceVersion(1, 1, 2, 3),
 +      makeConformanceVersion(1, 1, 2, 2),
 +      makeConformanceVersion(1, 1, 2, 1),
 +      makeConformanceVersion(1, 1, 2, 0),
 +      makeConformanceVersion(1, 1, 1, 3),
 +      makeConformanceVersion(1, 1, 1, 2),
 +      makeConformanceVersion(1, 1, 1, 1),
 +      makeConformanceVersion(1, 1, 1, 0),
 +      makeConformanceVersion(1, 1, 0, 3),
  };
  
  DE_INLINE bool isNullTerminated(const char* str, const deUint32 maxSize)

diff --cc external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
Simple merge