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

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

Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)

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

Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)
diff --cc external/openglcts/modules/common/glcRobustnessTests.cpp
Simple merge
diff --cc external/openglcts/modules/gles31/es31cShaderStorageBufferObjectTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)
		1	2
external/openglcts/modules/common/glcRobustnessTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/modules/gles31/es31cShaderStorageBufferObjectTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history