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

Commit 50166d11 authored by Andy McFadden's avatar Andy McFadden
Browse files

Hide three malformed GL bindings 

They were replaced with correct bindings a while back, but the
broken methods weren't hidden.

Also, pick up two changes that were made to the generated code
rather than the source.

Bug 6006380

Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
parent 20c7adbf

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");