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

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

Mon, 28 Oct 2019 20:19:08 +0000 (21:19 +0100)

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

Mon, 28 Oct 2019 20:19:08 +0000 (21:19 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 20:19:08 +0000 (21:19 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 20:19:08 +0000 (21:19 +0100)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 28 Oct 2019 20:19:08 +0000 (21:19 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 28 Oct 2019 20:19:08 +0000 (21:19 +0100)
		1	2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history