diff options
| author | Mathias Agopian <mathias@google.com> | 2012-07-23 16:25:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-23 16:25:33 -0700 |
| commit | 16a4003b11bd8fcc2b4c065f85de1464b1e21fe7 (patch) | |
| tree | a1e63eb95ca7f5b4c49e6fd60c32c379f25902fa /api/current.txt | |
| parent | cf56a0c1ea8dcffd1ba4c7f28f99e7f8d3eb8537 (diff) | |
| parent | dd06946252be852aa53eb6142a119b0fccc83cd1 (diff) | |
| download | frameworks_base-16a4003b11bd8fcc2b4c065f85de1464b1e21fe7.zip frameworks_base-16a4003b11bd8fcc2b4c065f85de1464b1e21fe7.tar.gz frameworks_base-16a4003b11bd8fcc2b4c065f85de1464b1e21fe7.tar.bz2 | |
Merge "updated gles20 bindings, fixes broken methods"
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 fc06774..a3f2fff 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14842,8 +14842,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); @@ -14868,6 +14872,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); |