diff options
| author | Jesse Hall <jessehall@google.com> | 2013-05-01 02:30:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-01 02:30:48 +0000 |
| commit | cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a (patch) | |
| tree | 50181664462c55422c5d5773a0ed9ef9dd549ae2 | |
| parent | 5d46b04bd5a8ec00ea527b68aa48907d3978a007 (diff) | |
| parent | 46fc9cb60cdbd44f4f42966d37babc8a1bc1263d (diff) | |
| download | native-cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a.tar.gz | |
Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
| -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 c71130790b..6e72c31090 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 }, |