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

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

Wed, 26 May 2021 10:03:17 +0000 (12:03 +0200)

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

Wed, 26 May 2021 10:03:17 +0000 (12:03 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 26 May 2021 10:03:17 +0000 (12:03 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 26 May 2021 10:03:17 +0000 (12:03 +0200)
diff --cc external/vulkancts/modules/vulkan/ycbcr/vktYCbCrCopyTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 26 May 2021 10:03:17 +0000 (12:03 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 26 May 2021 10:03:17 +0000 (12:03 +0200)
		1	2
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrCopyTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history