Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-next-dev

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

Fri, 19 Jan 2018 10:13:42 +0000 (11:13 +0100)

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

Fri, 19 Jan 2018 10:13:42 +0000 (11:13 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 19 Jan 2018 10:13:42 +0000 (11:13 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 19 Jan 2018 10:13:42 +0000 (11:13 +0100)
diff --cc external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 19 Jan 2018 10:13:42 +0000 (11:13 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 19 Jan 2018 10:13:42 +0000 (11:13 +0100)
		1	2
external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history