Merge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)
commitba2e6e89b4169461d87d216e1384e685b9c7da87
tree218600f0b9392c6a5a1e0c5d62a5bb0a27309af4
parent2cc8aad1e46887b8640dd9b8a269628d8a064a44
parent9785f0cc40270d8d4f58271d0ae7ea737e8fdb84
Merge vk-gl-cts/vulkan-cts-1.2.0 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ic6e8b920be9a0ff25a8765b7c11d57248fb400a3
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt