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

Change-Id: I4d99daf62d0ff2b7082e7d57f80df1ea1500ef93

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index bf76c77,33a0682..d13bcb0
--- 1/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@@ -47,8 -46,26 +47,9 @@@ enum TestTyp
        TEST_TYPE_VERSION,
  };
  
 -static const deUint32 knownDriverIds[] =
 -{
 -      // Specified in the Vulkan registry (vk.xml)
 -      1,      // author = "Advanced Micro Devices, Inc."   comment = "AMD proprietary driver"
 -      2,      // author = "Advanced Micro Devices, Inc."   comment = "AMD open-source driver"
 -      3,      // author = "Mesa open source project"       comment = "Mesa RADV driver"
 -      4,      // author = "NVIDIA Corporation"             comment = "NVIDIA proprietary driver"
 -      5,      // author = "Intel Corporation"              comment = "Intel proprietary Windows driver"
 -      6,      // author = "Intel Corporation"              comment = "Intel open-source Mesa driver"
 -      7,      // author = "Imagination Technologies"       comment = "Imagination proprietary driver"
 -      8,      // author = "Qualcomm Technologies, Inc."    comment = "Qualcomm proprietary driver"
 -      9,      // author = "Arm Limited"                    comment = "Arm proprietary driver"
 -      10,     // <enum value="10"      name="VK_DRIVER_ID_GOOGLE_SWIFTSHADER_KHR"        comment="Google LLC"/>
 -      11,     // <enum value="11"      name="VK_DRIVER_ID_GGP_PROPRIETARY_KHR"           comment="Google LLC"/>
 -      12,     // <enum value="12"      name="VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR"      comment="Broadcom Inc."/>
 -};
 -
  static const VkConformanceVersionKHR knownConformanceVersions[] =
  {
+       makeConformanceVersion(1, 2, 3, 1),
        makeConformanceVersion(1, 2, 3, 0),
        makeConformanceVersion(1, 2, 2, 1),
        makeConformanceVersion(1, 2, 2, 0),