Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

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

Thu, 6 Jun 2019 12:14:06 +0000 (14:14 +0200)

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

Thu, 6 Jun 2019 12:14:06 +0000 (14:14 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 6 Jun 2019 12:14:06 +0000 (14:14 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 6 Jun 2019 12:14:06 +0000 (14:14 +0200)
diff --cc external/vulkancts/framework/vulkan/vkDefs.hpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 6 Jun 2019 12:14:06 +0000 (14:14 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 6 Jun 2019 12:14:06 +0000 (14:14 +0200)
		1	2
external/vulkancts/framework/vulkan/vkDefs.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history