Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1

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

Wed, 15 Jan 2020 10:41:26 +0000 (11:41 +0100)

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

Wed, 15 Jan 2020 10:41:26 +0000 (11:41 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 15 Jan 2020 10:41:26 +0000 (11:41 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 15 Jan 2020 10:41:26 +0000 (11:41 +0100)
diff --cc external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockBasic.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 15 Jan 2020 10:41:26 +0000 (11:41 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 15 Jan 2020 10:41:26 +0000 (11:41 +0100)
		1	2
external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockBasic.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history