diff options
| author | Thomas Tafertshofer <tafertth@google.com> | 2012-07-19 16:55:37 -0700 |
|---|---|---|
| committer | Thomas Tafertshofer <tafertth@google.com> | 2012-07-19 17:04:47 -0700 |
| commit | dd06946252be852aa53eb6142a119b0fccc83cd1 (patch) | |
| tree | de1b0c3ae2dda9d04bd5b451aa8522f146aff15b /api/current.txt | |
| parent | 60620a23996d7e6de72834bebde3b3c57981e219 (diff) | |
| download | frameworks_base-dd06946252be852aa53eb6142a119b0fccc83cd1.zip frameworks_base-dd06946252be852aa53eb6142a119b0fccc83cd1.tar.gz frameworks_base-dd06946252be852aa53eb6142a119b0fccc83cd1.tar.bz2 | |
updated gles20 bindings, fixes broken methods
this adds correct versions of the broken GLES20 methods
glGetShaderSource, glGetActiveAttrib and glGetActiveUniform.
the old functions are still there and need to be @hide later.
Bug: 6006380
Change-Id: I8127a77c4b89aa8a9a54bea88774077535e2139d
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index f2448a2..bbcf6fb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14840,8 +14840,12 @@ package android.opengl { 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); method public static void glGetAttachedShaders(int, int, java.nio.IntBuffer, java.nio.IntBuffer); method public static int glGetAttribLocation(int, java.lang.String); @@ -14866,6 +14870,7 @@ package android.opengl { 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); method public static java.lang.String glGetString(int); |