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

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

Sat, 21 Dec 2019 11:23:06 +0000 (12:23 +0100)

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

Sat, 21 Dec 2019 11:23:06 +0000 (12:23 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Sat, 21 Dec 2019 11:23:06 +0000 (12:23 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Sat, 21 Dec 2019 11:23:06 +0000 (12:23 +0100)
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>
	Sat, 21 Dec 2019 11:23:06 +0000 (12:23 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Sat, 21 Dec 2019 11:23:06 +0000 (12:23 +0100)
		1	2
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