Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfc3f21a authored by Andy McFadden's avatar Andy McFadden Committed by Android (Google) Code Review
Browse files

Merge "Hide three malformed GL bindings"

parents 5efe5a2d 9ba6ecb2

api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -17149,11 +17149,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);
@@ -17179,7 +17177,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);

opengl/java/android/opengl/GLES20.java

+3 −0
Original line number Diff line number Diff line
@@ -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,