diff options
| author | Elliott Hughes <enh@google.com> | 2013-09-27 15:41:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-27 15:41:25 -0700 |
| commit | 917f88f033aafb89cbb77feda2932cf88698a56a (patch) | |
| tree | 80305acf1c53dc2f598f489b04cd404781b3e095 /core/jni | |
| parent | 19db889424addfdf2eae9e3dac1c97d93e13cb74 (diff) | |
| parent | 82e5d8758a61f1a49700f67f6ddb69219528bad2 (diff) | |
| download | frameworks_base-917f88f033aafb89cbb77feda2932cf88698a56a.zip frameworks_base-917f88f033aafb89cbb77feda2932cf88698a56a.tar.gz frameworks_base-917f88f033aafb89cbb77feda2932cf88698a56a.tar.bz2 | |
am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."
* commit '82e5d8758a61f1a49700f67f6ddb69219528bad2':
Regenerate all the OpenGL stubs.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_opengl_GLES20.cpp | 3 | ||||
| -rw-r--r-- | core/jni/android_opengl_GLES30.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/jni/android_opengl_GLES20.cpp b/core/jni/android_opengl_GLES20.cpp index 9bc69ae..db03b70 100644 --- a/core/jni/android_opengl_GLES20.cpp +++ b/core/jni/android_opengl_GLES20.cpp @@ -353,6 +353,7 @@ android_glBindAttribLocation__IILjava_lang_String_2 const char* _nativename = 0; if (!name) { + _exception = 1; _exceptionType = "java/lang/IllegalArgumentException"; _exceptionMessage = "name == null"; goto exit; @@ -2454,6 +2455,7 @@ android_glGetAttribLocation__ILjava_lang_String_2 const char* _nativename = 0; if (!name) { + _exception = 1; _exceptionType = "java/lang/IllegalArgumentException"; _exceptionMessage = "name == null"; goto exit; @@ -3602,6 +3604,7 @@ android_glGetUniformLocation__ILjava_lang_String_2 const char* _nativename = 0; if (!name) { + _exception = 1; _exceptionType = "java/lang/IllegalArgumentException"; _exceptionMessage = "name == null"; goto exit; diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp index 832d643..4c62a75 100644 --- a/core/jni/android_opengl_GLES30.cpp +++ b/core/jni/android_opengl_GLES30.cpp @@ -2511,6 +2511,7 @@ android_glGetFragDataLocation__ILjava_lang_String_2 const char* _nativename = 0; if (!name) { + _exception = 1; _exceptionType = "java/lang/IllegalArgumentException"; _exceptionMessage = "name == null"; goto exit; @@ -3361,6 +3362,7 @@ android_glGetUniformBlockIndex__ILjava_lang_String_2 const char* _nativeuniformBlockName = 0; if (!uniformBlockName) { + _exception = 1; _exceptionType = "java/lang/IllegalArgumentException"; _exceptionMessage = "uniformBlockName == null"; goto exit; |