diff options
| author | Mathias Agopian <mathias@google.com> | 2013-02-23 04:13:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-23 04:13:34 +0000 |
| commit | 0d1ab1db229ffc1d776df466b02e2b51c004df9c (patch) | |
| tree | 93ab25ad25b5530c263cbf21e7ac102cbcf99ef4 /core/jni/android_opengl_GLES20.cpp | |
| parent | bd0dc13cb870e4dc0c3dfbbeba83a9e03ab481e9 (diff) | |
| parent | 89be00bcda2b5965757e83bdf70a650b64373045 (diff) | |
| download | frameworks_base-0d1ab1db229ffc1d776df466b02e2b51c004df9c.zip frameworks_base-0d1ab1db229ffc1d776df466b02e2b51c004df9c.tar.gz frameworks_base-0d1ab1db229ffc1d776df466b02e2b51c004df9c.tar.bz2 | |
Merge "regenerate egl/gles stubs from glgen"
Diffstat (limited to 'core/jni/android_opengl_GLES20.cpp')
| -rw-r--r-- | core/jni/android_opengl_GLES20.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_opengl_GLES20.cpp b/core/jni/android_opengl_GLES20.cpp index c530117..a263f8b 100644 --- a/core/jni/android_opengl_GLES20.cpp +++ b/core/jni/android_opengl_GLES20.cpp @@ -2127,14 +2127,14 @@ android_glGetAttachedShaders__IILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2 } } -/* int glGetAttribLocation ( GLuint program, const char *name ) */ +/* GLint glGetAttribLocation ( GLuint program, const char *name ) */ static jint android_glGetAttribLocation__ILjava_lang_String_2 (JNIEnv *_env, jobject _this, jint program, jstring name) { jint _exception = 0; const char * _exceptionType; const char * _exceptionMessage; - int _returnValue = 0; + GLint _returnValue = 0; const char* _nativename = 0; if (!name) { @@ -3983,14 +3983,14 @@ android_glGetUniformiv__IILjava_nio_IntBuffer_2 } } -/* int glGetUniformLocation ( GLuint program, const char *name ) */ +/* GLint glGetUniformLocation ( GLuint program, const char *name ) */ static jint android_glGetUniformLocation__ILjava_lang_String_2 (JNIEnv *_env, jobject _this, jint program, jstring name) { jint _exception = 0; const char * _exceptionType; const char * _exceptionMessage; - int _returnValue = 0; + GLint _returnValue = 0; const char* _nativename = 0; if (!name) { |