summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-02-24 16:45:21 -0800
committerJamie Gennis <jgennis@google.com>2011-02-24 16:45:21 -0800
commitdc02e18d154ed6271bbd7bc346de619f2698bd9a (patch)
tree5d10565c5bb1167482500085fabcaed0ff5a8393 /graphics
parent7d4da25c5cbc75c7443389a25e7e30d1c2888723 (diff)
downloadframeworks_base-dc02e18d154ed6271bbd7bc346de619f2698bd9a.zip
frameworks_base-dc02e18d154ed6271bbd7bc346de619f2698bd9a.tar.gz
frameworks_base-dc02e18d154ed6271bbd7bc346de619f2698bd9a.tar.bz2
Revert "Merge "Expand on the SurfaceTexture API docs.""
This reverts commit 069d748da85559ffb2d09d181b186b1f71e350e7, reversing changes made to b607b884bd94d4f75fb4b2ead7457f2027ceb850.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/SurfaceTexture.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java
index ab75b81..2d23fe9 100644
--- a/graphics/java/android/graphics/SurfaceTexture.java
+++ b/graphics/java/android/graphics/SurfaceTexture.java
@@ -45,13 +45,7 @@ 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
- * {@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.
+ * OES_EGL_image_external OpenGL ES extension. This limits how the texture may be used.
*
* <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