diff options
| author | Jesse Hall <jessehall@google.com> | 2013-04-30 19:38:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 19:38:14 -0700 |
| commit | fcafc3259e62de3511a531ccc128a46e98c8d2a1 (patch) | |
| tree | df82d6b4b2afd6b4f080e8d737cb1c6e06bab805 /core/jni/android_opengl_GLES30.cpp | |
| parent | e72bd5430236f2bfaeda3ddcce183286c713e295 (diff) | |
| parent | 0b30ad53423a9bfab53b1632a33159be3d82e3df (diff) | |
| download | frameworks_base-fcafc3259e62de3511a531ccc128a46e98c8d2a1.zip frameworks_base-fcafc3259e62de3511a531ccc128a46e98c8d2a1.tar.gz frameworks_base-fcafc3259e62de3511a531ccc128a46e98c8d2a1.tar.bz2 | |
am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev
* commit '0b30ad53423a9bfab53b1632a33159be3d82e3df':
Fix GLES30 JNI registration
Diffstat (limited to 'core/jni/android_opengl_GLES30.cpp')
| -rw-r--r-- | core/jni/android_opengl_GLES30.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp index 4cf9313..832d643 100644 --- a/core/jni/android_opengl_GLES30.cpp +++ b/core/jni/android_opengl_GLES30.cpp @@ -5145,7 +5145,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 }, |