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>

Fri, 21 May 2021 12:12:54 +0000 (14:12 +0200)

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

Fri, 21 May 2021 12:12:54 +0000 (14:12 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 21 May 2021 12:12:54 +0000 (14:12 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 21 May 2021 12:12:54 +0000 (14:12 +0200)
diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 21 May 2021 12:12:54 +0000 (14:12 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 21 May 2021 12:12:54 +0000 (14:12 +0200)
		1	2
external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp	patch \|	diff1 \|	diff2 \|	blob \| history