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

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

Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)

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

Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)
diff --cc external/vulkancts/modules/vulkan/CMakeLists.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)
		1	2
external/vulkancts/modules/vulkan/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history