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>

Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)

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

Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history