diff options
| author | Jesse Hall <jessehall@google.com> | 2013-04-29 15:59:35 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2013-04-29 16:02:16 -0700 |
| commit | d877efe3b12afdd84f06c180369f9d7399858f6e (patch) | |
| tree | 88acdb7737f4fcfc032dd2dd43a0c3fcda4f738d /core/jni | |
| parent | 9f844790f305338de4fa3adda5e125c811f280ca (diff) | |
| download | frameworks_base-d877efe3b12afdd84f06c180369f9d7399858f6e.zip frameworks_base-d877efe3b12afdd84f06c180369f9d7399858f6e.tar.gz frameworks_base-d877efe3b12afdd84f06c180369f9d7399858f6e.tar.bz2 | |
Fix GLES30 JNI registration
Bug: 8657863
Change-Id: I498f32480863b0716b2a8dfce467143087573cce
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_opengl_GLES30.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 3b6b160..53fde48 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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), diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp index ac294bd..3c50aa0 100644 --- a/core/jni/android_opengl_GLES30.cpp +++ b/core/jni/android_opengl_GLES30.cpp @@ -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 }, |