Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ifca686b3e3eb561a923bbc74f29de536d2f9f945

diff --cc AndroidGen.mk
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingBufferDeviceAddressTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
index 24f4c25,8be1206..c2ba7e8
--- 1/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
--- 2/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
@@@ -863,9 -878,11 +862,9 @@@ tcu::TestStatus DescriptorSetRandomTest
  
        VkPhysicalDeviceFeatures2 features;
        VkPhysicalDeviceInlineUniformBlockFeaturesEXT inlineUniformFeatures;
-       VkPhysicalDeviceDescriptorIndexingFeatures indexingFeatures;
+       VkPhysicalDeviceDescriptorIndexingFeaturesEXT indexingFeatures;
        getNeededFeatures(m_context, features, inlineUniformFeatures, indexingFeatures);
  
 -      m_context.getInstanceInterface().getPhysicalDeviceFeatures2(m_context.getPhysicalDevice(), &features);
 -
        deRandom rnd;
        deRandom_init(&rnd, m_data.seed);
  

diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp
Simple merge

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

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