Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)
commit4f5b2863f4943b63d09544ece7c6ea29df965f62
treef4de925f4e64c0204ba31a8f858b07242cb38c8e
parent0d3ae2f25be3234d4e50c6cfcb01b9c678259f02
parent366b89a38e68c70420ae7c8e5f4a20d0aea88810
Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

Change-Id: I033c9220c75bfe0747e6d7b75c7eb00f4619c383
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/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt