commit | bb1e7d4324ff43491c526c77f405bbbf0cece611 | [log] [tgz] |
---|---|---|
author | Mathias Agopian <mathias@google.com> | Tue Nov 29 17:46:35 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 29 17:46:35 2011 -0800 |
tree | 235d607f7473ec35ba7db47e9fc371166f143398 | |
parent | 6f1dd757cb158d17c76baeb170f7db2271802ef8 [diff] | |
parent | 77cec6132aea6ed98812125f5ad5f79e889cf658 [diff] |
Merge changes I7e973a35,Ib3386fcc into ics-mr1 * changes: SurfaceTexture: add EGL_KHR_fence_sync option SurfaceTexture: add a blit-to-FBO test