Merge vk-gl-cts/opengl-es-cts-3.2.4 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 26 Mar 2018 12:01:52 +0000 (14:01 +0200)
commitc941abf546e4d02225bceac92fff83e4cb4cc71a
tree1c2c00eda0471da69de5d3238b78572d70f30570
parent4ecf7b93fbc97922ee8cc7060495f10a8aabded2
parent11190aa4e93bbcf1a7ae6aebb741a0ee63ec3fab
Merge vk-gl-cts/opengl-es-cts-3.2.4 into vk-gl-cts/master

Change-Id: Id1abb58d7a7c93277531a74ca38eaf5d5e6d7550
external/openglcts/modules/common/glcRobustnessTests.cpp
external/openglcts/modules/gles31/es31cShaderStorageBufferObjectTests.cpp