Merge vk-gl-cts/vulkan-cts-1.3.1 into vk-gl-cts/dev/VK_KHR_global_priority

Change-Id: Icba0010f8d5d655a23414d28f46a6536d0af52ea

diff --cc android/cts/master/vk-master-2021-03-01/api.txt
Simple merge

diff --cc android/cts/master/vk-master/api.txt
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
index 7ac4f48,e8af824..b6161df
--- 1/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
--- 2/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
@@@ -79,10 -80,26 +80,27 @@@ static const char* s_allowedDeviceKhrEx
        "VK_KHR_shader_subgroup_uniform_control_flow",
        "VK_KHR_present_id",
        "VK_KHR_present_wait",
-       "VK_KHR_shader_integer_dot_product",
        "VK_KHR_format_feature_flags2",
        "VK_KHR_maintenance4",
+       "VK_KHR_dynamic_rendering",
+       "VK_EXT_extended_dynamic_state",
+       "VK_EXT_extended_dynamic_state2",
+       "VK_EXT_4444_formats",
+       "VK_KHR_shader_integer_dot_product",
+       "VK_EXT_image_robustness",
+       "VK_EXT_inline_uniform_block",
+       "VK_EXT_pipeline_creation_cache_control",
+       "VK_EXT_pipeline_creation_feedback",
+       "VK_EXT_private_data",
+       "VK_EXT_shader_demote_to_helper_invocation",
+       "VK_EXT_subgroup_size_control",
+       "VK_EXT_texel_buffer_alignment",
+       "VK_EXT_texture_compression_astc_hdr",
+       "VK_EXT_tooling_info",
+       "VK_EXT_ycbcr_2plane_444_formats",
        "VK_EXT_border_color_swizzle",
 +      "VK_KHR_global_priority",
+       "VK_NV_mesh_shader",
+       "VK_KHR_portability_subset",
  };
  

diff --cc external/vulkancts/mustpass/master/vk-default/api.txt
Simple merge

diff --cc external/vulkancts/scripts/src/extensions_data.txt
index f457259,15fbd03..196c686
--- 1/external/vulkancts/scripts/src/extensions_data.txt
--- 2/external/vulkancts/scripts/src/extensions_data.txt
+++ b/external/vulkancts/scripts/src/extensions_data.txt
@@@ -98,8 -98,24 +98,25 @@@ VK_EXT_multi_draw                                                   DEVIC
  VK_KHR_shader_subgroup_uniform_control_flow   DEVICE
  VK_KHR_present_id                                                     DEVICE
  VK_KHR_present_wait                                                   DEVICE
- VK_KHR_shader_integer_dot_product                     DEVICE
- VK_KHR_format_feature_flags2                          DEVICE
- VK_KHR_maintenance4                                                   DEVICE
+ VK_KHR_format_feature_flags2                          DEVICE 1_3_0
+ VK_KHR_maintenance4                                                   DEVICE 1_3_0
+ VK_KHR_dynamic_rendering                                      DEVICE 1_3_0
+ VK_EXT_extended_dynamic_state                         DEVICE 1_3_0
+ VK_EXT_extended_dynamic_state2                                DEVICE
+ VK_EXT_4444_formats                                                   DEVICE 1_3_0
+ VK_KHR_shader_integer_dot_product                     DEVICE 1_3_0
+ VK_EXT_image_robustness                                               DEVICE 1_3_0
+ VK_EXT_inline_uniform_block                                   DEVICE 1_3_0
+ VK_EXT_pipeline_creation_cache_control                DEVICE 1_3_0
+ VK_EXT_pipeline_creation_feedback                     DEVICE 1_3_0
+ VK_EXT_private_data                                                   DEVICE 1_3_0
+ VK_EXT_shader_demote_to_helper_invocation     DEVICE 1_3_0
+ VK_EXT_subgroup_size_control                          DEVICE 1_3_0
+ VK_EXT_texel_buffer_alignment                         DEVICE 1_3_0
+ VK_EXT_texture_compression_astc_hdr                   DEVICE 1_3_0
+ VK_EXT_tooling_info                                                   DEVICE 1_3_0
+ VK_EXT_ycbcr_2plane_444_formats                               DEVICE
  VK_EXT_border_color_swizzle                                   DEVICE
 +VK_KHR_global_priority                                        DEVICE
+ VK_NV_mesh_shader                                                     DEVICE
+ VK_KHR_portability_subset                                     DEVICE