Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/master

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

Wed, 9 Dec 2020 17:12:11 +0000 (18:12 +0100)

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

Wed, 9 Dec 2020 17:13:37 +0000 (18:13 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 9 Dec 2020 17:12:11 +0000 (18:12 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 9 Dec 2020 17:13:37 +0000 (18:13 +0100)
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/data/vulkan/amber/graphicsfuzz/index.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
Simple merge
diff --cc external/vulkancts/mustpass/master/vk-default.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 9 Dec 2020 17:12:11 +0000 (18:12 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 9 Dec 2020 17:13:37 +0000 (18:13 +0100)
		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/data/vulkan/amber/graphicsfuzz/index.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history