Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)
commit99341d9d834e607161f0aac4d4d0edefe027e5e6
treeb46daf242ee3eab3b16eaa2f467f25507c80f552
parent1cac8f88bcee0b8e9cfdc4ab8cc3aa6a9fd175e7
parentb47620814aa062db15b3e8057f751b89705cebf3
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: Id479d9ffe34b394d216d8961bdd06e76611fcf18
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt