Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-1.2.2

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

Fri, 22 May 2020 13:27:00 +0000 (15:27 +0200)

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

Fri, 22 May 2020 13:27:00 +0000 (15:27 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 22 May 2020 13:27:00 +0000 (15:27 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 22 May 2020 13:27:00 +0000 (15:27 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 22 May 2020 13:27:00 +0000 (15:27 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 22 May 2020 13:27:00 +0000 (15:27 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history