Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

author Alexander Galazin <alexander.galazin@arm.com>

Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)

committer Alexander Galazin <alexander.galazin@arm.com>

Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkStructTypes.inl
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.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
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 14 Nov 2019 10:10:50 +0000 (11:10 +0100)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkBasicTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStructTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default-no-waivers.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history