Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 26 Jan 2018 00:47:12 +0000 (16:47 -0800)
committerChris Forbes <chrisforbes@google.com>
Fri, 26 Jan 2018 00:47:12 +0000 (16:47 -0800)
commit3e4c203b60dd6a759c41f6438d67f1b973f5a18d
tree99964621157848db5b8535f74d9afac28d255b5b
parent8bcd52ec2433fe9d04bcd9bbb72a41e4a74c4478
parentb821430a4718804a0e1ea1e810732940df927697
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: Ie7623be11190d678413fbe64da5d41d98e370b2c
20 files changed:
AndroidGen.mk
android/cts/master/gles2-master.txt
android/cts/master/gles3-master.txt
framework/common/tcuApp.cpp
framework/common/tcuApp.hpp
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/platform/null/tcuNullRenderContextFuncs.inl
framework/platform/null/tcuNullRenderContextInitFuncs.inl
modules/gles3/functional/CMakeLists.txt
modules/gles3/functional/es3fFunctionalTests.cpp
scripts/check_build_sanity.py
scripts/opengl/src_util.py