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

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

Tue, 27 Jul 2021 10:25:19 +0000 (12:25 +0200)

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

Tue, 27 Jul 2021 10:52:24 +0000 (12:52 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 27 Jul 2021 10:25:19 +0000 (12:25 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 27 Jul 2021 10:52:24 +0000 (12:52 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 27 Jul 2021 10:25:19 +0000 (12:25 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 27 Jul 2021 10:52:24 +0000 (12:52 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp	patch \|	diff1 \|	diff2 \|	blob \| history