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

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

Tue, 16 Feb 2021 08:12:31 +0000 (09:12 +0100)

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

Tue, 16 Feb 2021 08:12:31 +0000 (09:12 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 16 Feb 2021 08:12:31 +0000 (09:12 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 16 Feb 2021 08:12:31 +0000 (09:12 +0100)
diff --cc external/vulkancts/framework/vulkan/vkImageUtil.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 16 Feb 2021 08:12:31 +0000 (09:12 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 16 Feb 2021 08:12:31 +0000 (09:12 +0100)
		1	2
external/vulkancts/framework/vulkan/vkImageUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history