Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master

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

Fri, 14 Sep 2018 19:02:19 +0000 (21:02 +0200)

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

Fri, 14 Sep 2018 19:02:19 +0000 (21:02 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 14 Sep 2018 19:02:19 +0000 (21:02 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 14 Sep 2018 19:02:19 +0000 (21:02 +0200)
diff --cc external/openglcts/modules/common/glcInternalformatTests.cpp
Simple merge
diff --cc external/openglcts/modules/common/glcPackedPixelsTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 14 Sep 2018 19:02:19 +0000 (21:02 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 14 Sep 2018 19:02:19 +0000 (21:02 +0200)
		1	2
external/openglcts/modules/common/glcInternalformatTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/modules/common/glcPackedPixelsTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history