Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2

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

Tue, 6 Nov 2018 10:59:01 +0000 (11:59 +0100)

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

Tue, 6 Nov 2018 10:59:01 +0000 (11:59 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 6 Nov 2018 10:59:01 +0000 (11:59 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 6 Nov 2018 10:59:01 +0000 (11:59 +0100)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 6 Nov 2018 10:59:01 +0000 (11:59 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 6 Nov 2018 10:59:01 +0000 (11:59 +0100)
		1	2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history