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>

Thu, 1 Oct 2020 11:24:44 +0000 (13:24 +0200)

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

Thu, 1 Oct 2020 11:24:44 +0000 (13:24 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 1 Oct 2020 11:24:44 +0000 (13:24 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 1 Oct 2020 11:24:44 +0000 (13:24 +0200)
diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp
Simple merge
diff --cc framework/common/tcuRasterizationVerifier.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 1 Oct 2020 11:24:44 +0000 (13:24 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 1 Oct 2020 11:24:44 +0000 (13:24 +0200)
		1	2
external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
framework/common/tcuRasterizationVerifier.cpp	patch \|	diff1 \|	diff2 \|	blob \| history