Merge vk-gl-cts/main into vk-gl-cts/dev/VK_EXT_mutable_descriptor_type

Change-Id: I544a1dc547da78ecc05e44ed1a826eb778dd70b8

diff --cc AndroidGen.mk
Simple merge

diff --cc android/cts/main/src/vk-master-2019-03-01.txt
Simple merge

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

diff --cc android/cts/main/vk-master-2022-03-01/api.txt
index d141a47,24cdc3f..3919e37
--- 1/android/cts/main/vk-master-2022-03-01/api.txt
--- 2/android/cts/main/vk-master-2022-03-01/api.txt
+++ b/android/cts/main/vk-master-2022-03-01/api.txt
@@@ -1101,10 -1685,17 +1685,15 @@@ dEQP-VK.api.external.memory.zircon_vmo.
  dEQP-VK.api.device_init.create_device_global_priority_khr.basic
  dEQP-VK.api.device_init.create_device_global_priority_query.basic
  dEQP-VK.api.device_init.create_device_global_priority_query_khr.basic
+ dEQP-VK.api.device_init.create_device_unsupported_features.mesh_shader_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.ray_tracing_maintenance1_features_khr
+ dEQP-VK.api.device_init.create_device_unsupported_features.present_barrier_features_nv
+ dEQP-VK.api.device_init.create_device_unsupported_features.extended_dynamic_state3_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.image2_d_view_of3_d_features_ext
 -dEQP-VK.api.device_init.create_device_unsupported_features.mutable_descriptor_type_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.primitives_generated_query_features_ext
+ dEQP-VK.api.device_init.create_device_unsupported_features.legacy_dithering_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.multisampled_render_to_single_sampled_features_ext
 -dEQP-VK.api.device_init.create_device_unsupported_features.rasterization_order_attachment_access_features_ext
+ dEQP-VK.api.device_init.create_device_unsupported_features.pipeline_protected_access_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.graphics_pipeline_library_features_ext
  dEQP-VK.api.device_init.create_device_unsupported_features.descriptor_set_host_mapping_features_valve
  dEQP-VK.api.device_init.create_device_unsupported_features.shader_module_identifier_features_ext

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp
index 4860b01,b67dce5..07fd9bb
--- 1/external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp
--- 2/external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp
@@@ -1053,9 -978,9 +1053,9 @@@ public
                DE_UNREF(iteration);
  
                static const auto kMandatoryMutableTypeFlags = toDescriptorTypeFlags(getMandatoryMutableTypes());
 -              if (type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE)
 +              if (type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT)
                {
-                       const auto descFlags = (toDescriptorTypeFlags(mutableTypesVec) | kMandatoryMutableTypeFlags);
+                       const auto descFlags = toDescriptorTypeFlags(mutableTypesVec);
                        return de::MovePtr<BindingInterface>(new SingleBinding(type, toDescriptorTypeVector(descFlags)));
                }