diff options
author | Jamie Gennis <jgennis@google.com> | 2011-02-24 14:24:04 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-24 14:24:04 -0800 |
commit | 069d748da85559ffb2d09d181b186b1f71e350e7 (patch) | |
tree | 6d862ca7e1da1e0c1c8a59bca2cac53507382b75 /graphics/java | |
parent | b607b884bd94d4f75fb4b2ead7457f2027ceb850 (diff) | |
parent | acf33974b3a870d904e662ae927947460c0d6b3f (diff) | |
download | frameworks_base-069d748da85559ffb2d09d181b186b1f71e350e7.zip frameworks_base-069d748da85559ffb2d09d181b186b1f71e350e7.tar.gz frameworks_base-069d748da85559ffb2d09d181b186b1f71e350e7.tar.bz2 |
Merge "Expand on the SurfaceTexture API docs."
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/graphics/SurfaceTexture.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java index 2d23fe9..ab75b81 100644 --- a/graphics/java/android/graphics/SurfaceTexture.java +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -45,7 +45,13 @@ import android.os.Message; * be done by transforming (1, 1, 0, 1). * * <p>The texture object uses the GL_TEXTURE_EXTERNAL_OES texture target, which is defined by the - * OES_EGL_image_external OpenGL ES extension. This limits how the texture may be used. + * {@link http://www.khronos.org/registry/gles/extensions/OES/OES_EGL_image_external.txt + * GL_OES_EGL_image_external} OpenGL ES extension. This limits how the texture may be used. Each + * time the texture is bound it must be bound to the GL_TEXTURE_EXTERNAL_OES target rather than the + * GL_TEXTURE_2D target. Additionally, any OpenGL ES 2.0 shader that samples from the texture must + * declare its use of this extension using, for example, an "#extension GL_OES_EGL_image_external : + * require" directive. Such shaders must also access the texture using the samplerExternalOES GLSL + * sampler type. * * <p>SurfaceTexture objects may be created on any thread. {@link #updateTexImage} may only be * called on the thread with the OpenGL ES context that contains the texture object. The |