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

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

Merge "Hide three malformed GL bindings"

parents 35571a41 50166d11

opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ not_valid_surface: 
    if (producer == NULL)

        goto not_valid_surface;



    window = new android::Surface(producer);

    window = new android::Surface(producer, true);



    if (window == NULL)

        goto not_valid_surface;

opengl/tools/glgen/stubs/gles11/glGetActiveAttrib.java

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


    // 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,

opengl/tools/glgen/stubs/gles11/glGetActiveUniform.java

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


    // 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,

opengl/tools/glgen/stubs/gles11/glGetShaderSource.java

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


    // 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,

opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) { 
            if (array) {

                releasePointer(_env, array, buf, 0);

            }

            buf = buf + offset;

            buf = (char*)buf + offset;

        } else {

            jniThrowException(_env, "java/lang/IllegalArgumentException",

                              "Must use a native order direct Buffer");