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>

Tue, 17 Dec 2019 15:29:31 +0000 (16:29 +0100)

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

Tue, 17 Dec 2019 15:29:31 +0000 (16:29 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 17 Dec 2019 15:29:31 +0000 (16:29 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 17 Dec 2019 15:29:31 +0000 (16:29 +0100)
diff --cc external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 17 Dec 2019 15:29:31 +0000 (16:29 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 17 Dec 2019 15:29:31 +0000 (16:29 +0100)
		1	2
external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history