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

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

Sun, 16 Jun 2019 19:18:26 +0000 (21:18 +0200)

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

Sun, 16 Jun 2019 19:18:26 +0000 (21:18 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Sun, 16 Jun 2019 19:18:26 +0000 (21:18 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Sun, 16 Jun 2019 19:18:26 +0000 (21:18 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 16 Jun 2019 19:18:26 +0000 (21:18 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 16 Jun 2019 19:18:26 +0000 (21:18 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history