diff options
| author | Andy McFadden <fadden@android.com> | 2014-02-14 13:09:07 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2014-02-19 10:34:54 -0800 |
| commit | 9ba6ecb275d62ad363bda73856c0e75590a73c57 (patch) | |
| tree | eec0e02634033b31da0684ac4e27f880b0853ba9 | |
| parent | 807e0c180b1aaf519ea9ff788508219166cd00cd (diff) | |
| download | frameworks_base-9ba6ecb275d62ad363bda73856c0e75590a73c57.zip frameworks_base-9ba6ecb275d62ad363bda73856c0e75590a73c57.tar.gz frameworks_base-9ba6ecb275d62ad363bda73856c0e75590a73c57.tar.bz2 | |
Hide three malformed GL bindings
They were replaced with correct bindings a while back, but the
broken methods weren't hidden.
Bug 6006380
Change-Id: I3432d37a6bf411bbd2b3ea363749e32fcff28672
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLES20.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index b55c1c7..1382e3d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17146,11 +17146,9 @@ package android.opengl { method public static void glGenTextures(int, java.nio.IntBuffer); method public static void glGenerateMipmap(int); method public static void glGetActiveAttrib(int, int, int, int[], int, int[], int, int[], int, byte[], int); - method public static void glGetActiveAttrib(int, int, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, byte); method public static java.lang.String glGetActiveAttrib(int, int, int[], int, int[], int); method public static java.lang.String glGetActiveAttrib(int, int, java.nio.IntBuffer, java.nio.IntBuffer); method public static void glGetActiveUniform(int, int, int, int[], int, int[], int, int[], int, byte[], int); - method public static void glGetActiveUniform(int, int, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, byte); method public static java.lang.String glGetActiveUniform(int, int, int[], int, int[], int); method public static java.lang.String glGetActiveUniform(int, int, java.nio.IntBuffer, java.nio.IntBuffer); method public static void glGetAttachedShaders(int, int, int[], int, int[], int); @@ -17176,7 +17174,6 @@ package android.opengl { method public static void glGetShaderPrecisionFormat(int, int, int[], int, int[], int); method public static void glGetShaderPrecisionFormat(int, int, java.nio.IntBuffer, java.nio.IntBuffer); method public static void glGetShaderSource(int, int, int[], int, byte[], int); - method public static void glGetShaderSource(int, int, java.nio.IntBuffer, byte); method public static java.lang.String glGetShaderSource(int); method public static void glGetShaderiv(int, int, int[], int); method public static void glGetShaderiv(int, int, java.nio.IntBuffer); diff --git a/opengl/java/android/opengl/GLES20.java b/opengl/java/android/opengl/GLES20.java index 8261474..137f2f5 100644 --- a/opengl/java/android/opengl/GLES20.java +++ b/opengl/java/android/opengl/GLES20.java @@ -823,6 +823,7 @@ public class GLES20 { // C function void glGetActiveAttrib ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name ) + /** @hide Method is broken, but used to be public (b/6006380) */ public static native void glGetActiveAttrib( int program, int index, @@ -870,6 +871,7 @@ public class GLES20 { // C function void glGetActiveUniform ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name ) + /** @hide Method is broken, but used to be public (b/6006380) */ public static native void glGetActiveUniform( int program, int index, @@ -1107,6 +1109,7 @@ public class GLES20 { // C function void glGetShaderSource ( GLuint shader, GLsizei bufsize, GLsizei *length, char *source ) + /** @hide Method is broken, but used to be public (b/6006380) */ public static native void glGetShaderSource( int shader, int bufsize, |