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

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

Fri, 4 Oct 2019 10:00:48 +0000 (12:00 +0200)

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

Fri, 4 Oct 2019 10:00:48 +0000 (12:00 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 4 Oct 2019 10:00:48 +0000 (12:00 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 4 Oct 2019 10:00:48 +0000 (12:00 +0200)
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
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>
	Fri, 4 Oct 2019 10:00:48 +0000 (12:00 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 4 Oct 2019 10:00:48 +0000 (12:00 +0200)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp	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