Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

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

Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)

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

Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)
		1	2
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history