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

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

Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)

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

Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.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>
	Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 15 Oct 2019 07:44:20 +0000 (09:44 +0200)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.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