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

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

Fri, 13 Jul 2018 14:54:16 +0000 (16:54 +0200)

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

Fri, 13 Jul 2018 14:54:16 +0000 (16:54 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 13 Jul 2018 14:54:16 +0000 (16:54 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 13 Jul 2018 14:54:16 +0000 (16:54 +0200)
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemShaderImageAccessTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 13 Jul 2018 14:54:16 +0000 (16:54 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 13 Jul 2018 14:54:16 +0000 (16:54 +0200)
		1	2
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemShaderImageAccessTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history