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>

Thu, 8 Jul 2021 18:08:17 +0000 (20:08 +0200)

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

Thu, 8 Jul 2021 18:08:17 +0000 (20:08 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 8 Jul 2021 18:08:17 +0000 (20:08 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 8 Jul 2021 18:08:17 +0000 (20:08 +0200)
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 8 Jul 2021 18:08:17 +0000 (20:08 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 8 Jul 2021 18:08:17 +0000 (20:08 +0200)
		1	2
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp	patch \|	diff1 \|	diff2 \|	blob \| history