Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 8 Oct 2019 17:58:13 +0000 (19:58 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 8 Oct 2019 18:00:46 +0000 (20:00 +0200)
commitee2fe8ed76789af821934a15e7872685e15633f9
tree29665ba7e42aa8db3a4ab3a29f7ba9f4c6f7e9f6
parentba8fc90726dd0536c3ae8e2a935ac2606949a4cb
parentb3b6fe0295a0c3b87cfacb6773e51172a80d2a11
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: I3a4a19f9d8bba49c51d01cc6f07fda4ceb496b45
18 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
external/vulkancts/framework/vulkan/vkDeviceFeatures.inl
external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl
external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl
external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl
external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl
external/vulkancts/framework/vulkan/vkStrUtil.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/framework/vulkan/vkVulkan_c.inl
external/vulkancts/modules/vulkan/vktTestPackage.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt
external/vulkancts/scripts/src/extensions_data.txt
external/vulkancts/scripts/src/vulkan_core.h