Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master

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

Wed, 14 Mar 2018 12:44:28 +0000 (13:44 +0100)

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

Wed, 14 Mar 2018 12:44:28 +0000 (13:44 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 14 Mar 2018 12:44:28 +0000 (13:44 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 14 Mar 2018 12:44:28 +0000 (13:44 +0100)
diff --cc external/openglcts/modules/gl/gl4cCopyImageTests.cpp
Simple merge
diff --cc external/openglcts/modules/gl/gl4cKHRDebugTests.cpp
Simple merge
diff --cc framework/platform/lnx/X11/tcuLnxX11.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 14 Mar 2018 12:44:28 +0000 (13:44 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 14 Mar 2018 12:44:28 +0000 (13:44 +0100)
		1	2
external/openglcts/modules/gl/gl4cCopyImageTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/modules/gl/gl4cKHRDebugTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
framework/platform/lnx/X11/tcuLnxX11.cpp	patch \|	diff1 \|	diff2 \|	blob \| history