Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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

Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)

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

Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.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>
	Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.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