diff options
| author | Jesse Hall <jessehall@google.com> | 2013-04-30 19:34:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 19:34:49 -0700 |
| commit | c59db7fdfeb8e95e6405945b0aeff1ed5e9f0012 (patch) | |
| tree | 42f7ad5f2de82b933575969eddb0bb31f750cc6a /opengl/tools | |
| parent | 80f9f26d1004a37e086c948609419ef1a8ae1467 (diff) | |
| parent | 34c0fb183767b80e93a7cd77233ead5fe50bd822 (diff) | |
| download | frameworks_native-c59db7fdfeb8e95e6405945b0aeff1ed5e9f0012.zip frameworks_native-c59db7fdfeb8e95e6405945b0aeff1ed5e9f0012.tar.gz frameworks_native-c59db7fdfeb8e95e6405945b0aeff1ed5e9f0012.tar.bz2 | |
am 34c0fb18: am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
* commit '34c0fb183767b80e93a7cd77233ead5fe50bd822':
Fix glGetUniformIndices JNI prototype
Diffstat (limited to 'opengl/tools')
| -rw-r--r-- | opengl/tools/glgen/stubs/gles11/glGetUniformIndices.nativeReg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.nativeReg b/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.nativeReg index c711307..6e72c31 100644 --- a/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.nativeReg +++ b/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.nativeReg @@ -1,2 +1,2 @@ {"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 }, |