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

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

Tue, 24 Apr 2018 13:58:35 +0000 (15:58 +0200)

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

Tue, 24 Apr 2018 13:58:35 +0000 (15:58 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 24 Apr 2018 13:58:35 +0000 (15:58 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 24 Apr 2018 13:58:35 +0000 (15:58 +0200)
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 24 Apr 2018 13:58:35 +0000 (15:58 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 24 Apr 2018 13:58:35 +0000 (15:58 +0200)
		1	2
external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history