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

Commit dde548d4 authored by Pablo Ceballos's avatar Pablo Ceballos
Browse files

Fix glGetTransformFeedbackVarying JNI 

- Deprecate the broken version that takes a byte argument.
- Implement a new version that takes a byte buffer argument.

Bug 19478262

Change-Id: I31cdb2e8bbcad5238b74443cf4ef25d36f5aba52
parent c5cec281

opengl/tools/glgen/stubs/gles11/glGetTransformFeedbackVarying.cpp

+21 −5
Original line number Original line Diff line number Diff line
@@ -118,22 +118,35 @@ exit: 
static void

static void

android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_IntBuffer_2B

android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_IntBuffer_2B

  (JNIEnv *_env, jobject _this, jint program, jint index, jint bufsize, jobject length_buf, jobject size_buf, jobject type_buf, jbyte name) {

  (JNIEnv *_env, jobject _this, jint program, jint index, jint bufsize, jobject length_buf, jobject size_buf, jobject type_buf, jbyte name) {

    jniThrowException(_env, "java/lang/UnsupportedOperationException", "deprecated");

}



/* void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name ) */

static void

android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_ByteBuffer_2

  (JNIEnv *_env, jobject _this, jint program, jint index, jint bufsize, jobject length_buf, jobject size_buf, jobject type_buf, jobject name_buf) {

    jintArray _lengthArray = (jintArray) 0;

    jintArray _lengthArray = (jintArray) 0;

    jint _lengthBufferOffset = (jint) 0;

    jint _lengthBufferOffset = (jint) 0;

    jintArray _sizeArray = (jintArray) 0;

    jintArray _sizeArray = (jintArray) 0;

    jint _sizeBufferOffset = (jint) 0;

    jint _sizeBufferOffset = (jint) 0;

    jintArray _typeArray = (jintArray) 0;

    jintArray _typeArray = (jintArray) 0;

    jint _typeBufferOffset = (jint) 0;

    jint _typeBufferOffset = (jint) 0;

    jbyteArray _nameArray = (jbyteArray)0;

    jint _nameBufferOffset = (jint)0;

    jint _lengthRemaining;

    jint _lengthRemaining;

    GLsizei *length = (GLsizei *) 0;

    GLsizei *length = (GLsizei *) 0;

    jint _sizeRemaining;

    jint _sizeRemaining;

    GLint *size = (GLint *) 0;

    GLint *size = (GLint *) 0;

    jint _typeRemaining;

    jint _typeRemaining;

    GLenum *type = (GLenum *) 0;

    GLenum *type = (GLenum *) 0;

    jint _nameRemaining;

    GLchar* name = (GLchar*)0;







    length = (GLsizei *)getPointer(_env, length_buf, (jarray*)&_lengthArray, &_lengthRemaining, &_lengthBufferOffset);

    length = (GLsizei *)getPointer(_env, length_buf, (jarray*)&_lengthArray, &_lengthRemaining, &_lengthBufferOffset);

    size = (GLint *)getPointer(_env, size_buf, (jarray*)&_sizeArray, &_sizeRemaining, &_sizeBufferOffset);

    size = (GLint *)getPointer(_env, size_buf, (jarray*)&_sizeArray, &_sizeRemaining, &_sizeBufferOffset);

    type = (GLenum *)getPointer(_env, type_buf, (jarray*)&_typeArray, &_typeRemaining, &_typeBufferOffset);

    type = (GLenum *)getPointer(_env, type_buf, (jarray*)&_typeArray, &_typeRemaining, &_typeBufferOffset);

    name = (GLchar*)getPointer(_env, name_buf, (jarray*)&_nameArray, &_nameRemaining, &_nameBufferOffset);

    if (length == NULL) {

    if (length == NULL) {

        char * _lengthBase = (char *)_env->GetIntArrayElements(_lengthArray, (jboolean *) 0);

        char * _lengthBase = (char *)_env->GetIntArrayElements(_lengthArray, (jboolean *) 0);

        length = (GLsizei *) (_lengthBase + _lengthBufferOffset);

        length = (GLsizei *) (_lengthBase + _lengthBufferOffset);
@@ -146,6 +159,10 @@ android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuff 
        char * _typeBase = (char *)_env->GetIntArrayElements(_typeArray, (jboolean *) 0);

        char * _typeBase = (char *)_env->GetIntArrayElements(_typeArray, (jboolean *) 0);

        type = (GLenum *) (_typeBase + _typeBufferOffset);

        type = (GLenum *) (_typeBase + _typeBufferOffset);

    }

    }

    if (name == NULL) {

        char* _nameBase = (char *)_env->GetByteArrayElements(_nameArray, (jboolean*)0);

        name = (GLchar *) (_nameBase + _nameBufferOffset);

    }

    glGetTransformFeedbackVarying(

    glGetTransformFeedbackVarying(

        (GLuint)program,

        (GLuint)program,

        (GLuint)index,

        (GLuint)index,
@@ -153,11 +170,7 @@ android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuff 
        (GLsizei *)length,

        (GLsizei *)length,

        (GLint *)size,

        (GLint *)size,

        (GLenum *)type,

        (GLenum *)type,

        // The cast below is incorrect. The driver will end up writing to the

        (GLchar*)name

        // address specified by name, which will always crash the process since

        // it is guaranteed to be in low memory. The additional static_cast

        // suppresses the warning for now. http://b/19478262

        (char *)static_cast<uintptr_t>(name)

    );

    );

    if (_typeArray) {

    if (_typeArray) {

        releaseArrayPointer<jintArray, jint*, IntArrayReleaser>(_env, _typeArray, (jint*)type, JNI_TRUE);

        releaseArrayPointer<jintArray, jint*, IntArrayReleaser>(_env, _typeArray, (jint*)type, JNI_TRUE);
@@ -168,6 +181,9 @@ android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuff 
    if (_lengthArray) {

    if (_lengthArray) {

        releaseArrayPointer<jintArray, jint*, IntArrayReleaser>(_env, _lengthArray, (jint*)length, JNI_TRUE);

        releaseArrayPointer<jintArray, jint*, IntArrayReleaser>(_env, _lengthArray, (jint*)length, JNI_TRUE);

    }

    }

    if (_nameArray) {

        releaseArrayPointer<jbyteArray, jbyte*, ByteArrayReleaser>(_env, _nameArray, (jbyte*)name, JNI_TRUE);

    }

}

}





/* void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name ) */

/* void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name ) */

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

+16 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,10 @@ 
    );

    );





    // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name )

    // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name )



    /**

     * @deprecated

     * Use the version that takes a ByteBuffer as the last argument, or the versions that return a String.

     * */

    public static native void glGetTransformFeedbackVarying(

    public static native void glGetTransformFeedbackVarying(

        int program,

        int program,

        int index,

        int index,
@@ -28,6 +31,18 @@ 




    // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name )

    // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name )





    public static native void glGetTransformFeedbackVarying(

        int program,

        int index,

        int bufsize,

        java.nio.IntBuffer length,

        java.nio.IntBuffer size,

        java.nio.IntBuffer type,

        java.nio.ByteBuffer name

    );



    // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name )



    public static native String glGetTransformFeedbackVarying(

    public static native String glGetTransformFeedbackVarying(

        int program,

        int program,

        int index,

        int index,

opengl/tools/glgen/stubs/gles11/glGetTransformFeedbackVarying.nativeReg

+1 −0
Original line number Original line Diff line number Diff line 
{"glGetTransformFeedbackVarying", "(III[II[II[II[BI)V", (void *) android_glGetTransformFeedbackVarying__III_3II_3II_3II_3BI },

{"glGetTransformFeedbackVarying", "(III[II[II[II[BI)V", (void *) android_glGetTransformFeedbackVarying__III_3II_3II_3II_3BI },

{"glGetTransformFeedbackVarying", "(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V", (void *) android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_IntBuffer_2B },

{"glGetTransformFeedbackVarying", "(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V", (void *) android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_IntBuffer_2B },

{"glGetTransformFeedbackVarying", "(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/ByteBuffer;)V", (void *) android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_IntBuffer_2Ljava_nio_ByteBuffer_2 },

{"glGetTransformFeedbackVarying", "(II[II[II)Ljava/lang/String;", (void *) android_glGetTransformFeedbackVarying1 },

{"glGetTransformFeedbackVarying", "(II[II[II)Ljava/lang/String;", (void *) android_glGetTransformFeedbackVarying1 },

{"glGetTransformFeedbackVarying", "(IILjava/nio/IntBuffer;Ljava/nio/IntBuffer;)Ljava/lang/String;", (void *) android_glGetTransformFeedbackVarying2 },
 
{"glGetTransformFeedbackVarying", "(IILjava/nio/IntBuffer;Ljava/nio/IntBuffer;)Ljava/lang/String;", (void *) android_glGetTransformFeedbackVarying2 },