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

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

Thu, 8 Nov 2018 13:55:15 +0000 (14:55 +0100)

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

Thu, 8 Nov 2018 13:55:15 +0000 (14:55 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 8 Nov 2018 13:55:15 +0000 (14:55 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 8 Nov 2018 13:55:15 +0000 (14:55 +0100)
diff --cc external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 8 Nov 2018 13:55:15 +0000 (14:55 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 8 Nov 2018 13:55:15 +0000 (14:55 +0100)
		1	2
external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp	patch \|	diff1 \|	diff2 \|	blob \| history