resolve merge conflicts of ae3759c7 to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Fri, 14 Jul 2017 18:34:35 +0000 (11:34 -0700)
committerMika Isojärvi <misojarvi@google.com>
Fri, 14 Jul 2017 18:36:13 +0000 (11:36 -0700)
commit27c7c47162581971834f113c1c716387b5ed0beb
treedb8733d4bb0620f2e85a95ab39169845c837a627
parent012c52fc4ce2daba3daa707cb59e983c2aa15b95
parentae3759c7c9744a88ef60fc869c4c235b72fa4a22
resolve merge conflicts of ae3759c7 to deqp-dev

Test: Build deqp apk and ran scripts/check_build_sanity.py
Change-Id: I2aad44982a04d1066c7a7f37fac139b735c5211b
13 files changed:
framework/opengl/gluCallLogWrapper.inl
framework/opengl/gluCallLogWrapperApi.inl
framework/opengl/wrapper/glwApi.inl
framework/opengl/wrapper/glwEnums.inl
framework/opengl/wrapper/glwFunctionTypes.inl
framework/opengl/wrapper/glwFunctions.inl
framework/opengl/wrapper/glwImpl.inl
framework/opengl/wrapper/glwInitExtES.inl
framework/opengl/wrapper/glwInitExtGL.inl
framework/opengl/wrapper/glwVersions.inl
framework/platform/null/tcuNullRenderContextFuncs.inl
framework/platform/null/tcuNullRenderContextInitFuncs.inl
scripts/opengl/src_util.py