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

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

Thu, 18 Jan 2018 11:07:31 +0000 (12:07 +0100)

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

Thu, 18 Jan 2018 11:07:31 +0000 (12:07 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 18 Jan 2018 11:07:31 +0000 (12:07 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 18 Jan 2018 11:07:31 +0000 (12:07 +0100)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 18 Jan 2018 11:07:31 +0000 (12:07 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 18 Jan 2018 11:07:31 +0000 (12:07 +0100)
		1	2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history