Merge vk-gkl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3

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

Tue, 26 Feb 2019 18:44:27 +0000 (19:44 +0100)

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

Tue, 26 Feb 2019 18:44:27 +0000 (19:44 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 26 Feb 2019 18:44:27 +0000 (19:44 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 26 Feb 2019 18:44:27 +0000 (19:44 +0100)
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
Simple merge
diff --cc framework/platform/lnx/X11/tcuLnxX11.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 26 Feb 2019 18:44:27 +0000 (19:44 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 26 Feb 2019 18:44:27 +0000 (19:44 +0100)
		1	2
external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
framework/platform/lnx/X11/tcuLnxX11.cpp	patch \|	diff1 \|	diff2 \|	blob \| history