diff options
author | Mathias Agopian <mathias@google.com> | 2011-11-29 17:48:01 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 17:48:01 -0800 |
commit | 53233c52d04d20813760f655f0ec7ed28657825b (patch) | |
tree | 3d859fbffa0ef9495df1d244ac32b9e044b43105 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | b63de44c224b00e3186e8359c0a31b8d4c1e7f84 (diff) | |
parent | 0c740a46d2877cedc3315e57ab967019240f5a15 (diff) |
am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1
* commit 'bb1e7d4324ff43491c526c77f405bbbf0cece611':
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions