Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/master

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

Tue, 19 May 2020 11:56:46 +0000 (13:56 +0200)

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

Tue, 19 May 2020 11:56:46 +0000 (13:56 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 19 May 2020 11:56:46 +0000 (13:56 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 19 May 2020 11:56:46 +0000 (13:56 +0200)
diff --cc external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 19 May 2020 11:56:46 +0000 (13:56 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 19 May 2020 11:56:46 +0000 (13:56 +0200)
		1	2
external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history