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

Commit 09f3cc2b authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Fix GLES30 JNI registration" into jb-mr2-dev

parents b107b7e9 d877efe3

core/jni/AndroidRuntime.cpp

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ extern int register_android_opengl_jni_GLES10Ext(JNIEnv* env); 
extern int register_android_opengl_jni_GLES11(JNIEnv* env);

extern int register_android_opengl_jni_GLES11Ext(JNIEnv* env);

extern int register_android_opengl_jni_GLES20(JNIEnv* env);

extern int register_android_opengl_jni_GLES30(JNIEnv* env);



extern int register_android_hardware_Camera(JNIEnv *env);

extern int register_android_hardware_SensorManager(JNIEnv *env);
@@ -1125,6 +1126,7 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_opengl_jni_GLES11),

    REG_JNI(register_android_opengl_jni_GLES11Ext),

    REG_JNI(register_android_opengl_jni_GLES20),

    REG_JNI(register_android_opengl_jni_GLES30),



    REG_JNI(register_android_graphics_Bitmap),

    REG_JNI(register_android_graphics_BitmapFactory),

core/jni/android_opengl_GLES30.cpp

+1 −1
Original line number Diff line number Diff line
@@ -5144,7 +5144,7 @@ static JNINativeMethod methods[] = { 
{"glGetStringi", "(II)Ljava/lang/String;", (void *) android_glGetStringi__II },

{"glCopyBufferSubData", "(IIIII)V", (void *) android_glCopyBufferSubData__IIIII },

{"glGetUniformIndices", "(I[Ljava/lang/String;[II)V", (void *) android_glGetUniformIndices_array },

{"glGetUniformIndices", "(I[Ljava/lang/String;[Ljava/nio/IntBuffer)V", (void *) android_glGetUniformIndices_buffer },

{"glGetUniformIndices", "(I[Ljava/lang/String;Ljava/nio/IntBuffer;)V", (void *) android_glGetUniformIndices_buffer },

{"glGetActiveUniformsiv", "(II[III[II)V", (void *) android_glGetActiveUniformsiv__II_3III_3II },

{"glGetActiveUniformsiv", "(IILjava/nio/IntBuffer;ILjava/nio/IntBuffer;)V", (void *) android_glGetActiveUniformsiv__IILjava_nio_IntBuffer_2ILjava_nio_IntBuffer_2 },

{"glGetUniformBlockIndex", "(ILjava/lang/String;)I", (void *) android_glGetUniformBlockIndex__ILjava_lang_String_2 },