diff options
| author | Jesse Hall <jessehall@google.com> | 2013-04-30 19:32:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 19:32:39 -0700 |
| commit | 34c0fb183767b80e93a7cd77233ead5fe50bd822 (patch) | |
| tree | f2b2eddc50db39c1a634f5629b1646052bf6ea60 /opengl/tools/glgen/stubs/gles11 | |
| parent | ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2 (diff) | |
| parent | cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a (diff) | |
| download | frameworks_native-34c0fb183767b80e93a7cd77233ead5fe50bd822.zip frameworks_native-34c0fb183767b80e93a7cd77233ead5fe50bd822.tar.gz frameworks_native-34c0fb183767b80e93a7cd77233ead5fe50bd822.tar.bz2 | |
am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
* commit 'cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a':
Fix glGetUniformIndices JNI prototype
Diffstat (limited to 'opengl/tools/glgen/stubs/gles11')
| -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 }, |