Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

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

Fri, 12 Jun 2020 08:35:14 +0000 (10:35 +0200)

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

Fri, 12 Jun 2020 08:35:14 +0000 (10:35 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 12 Jun 2020 08:35:14 +0000 (10:35 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 12 Jun 2020 08:35:14 +0000 (10:35 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.hpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTimelineSemaphoreTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 12 Jun 2020 08:35:14 +0000 (10:35 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 12 Jun 2020 08:35:14 +0000 (10:35 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTimelineSemaphoreTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history