Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing

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

Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)

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

Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)
diff --cc android/cts/master/vk-master-2020-03-01.txt
Simple merge
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/mustpass/master/vk-default.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)
		1	2
android/cts/master/vk-master-2020-03-01.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history