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

Change-Id: I0c2d8b0e0fc665ae231559d1d1e0a1bad8ca1baf

diff --cc external/fetch_sources.py
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkVulkan_c.inl
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index 4c566f8,d41f880..d52eaeb
--- 1/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@@ -63,24 -63,26 +63,26 @@@ static const deUint32 knownDriverIds[] 
        12,     // <enum value="12"      name="VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR"      comment="Broadcom Inc."/>
  };
  
- static const VkConformanceVersion knownConformanceVersions[] =
+ static const VkConformanceVersionKHR knownConformanceVersions[] =
  {
 -      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, 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/scripts/src/vulkan_core.h
index dd25ff2,7f3548b..0e3f5d4
mode 100644,100755..100644
--- 1/external/vulkancts/scripts/src/vulkan_core.h
--- 2/external/vulkancts/scripts/src/vulkan_core.h
+++ b/external/vulkancts/scripts/src/vulkan_core.h