Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."

Browse Source 
* commit '82e5d8758a61f1a49700f67f6ddb69219528bad2':
  Regenerate all the OpenGL stubs.
This commit is contained in:
Elliott Hughes
2013-09-27 15:41:25 -07:00
committed by Android Git Automerger
parent 19db889424 82e5d8758a
commit 917f88f033
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_opengl_GLES20.cpp
View File

@@ -353,6 +353,7 @@ android_glBindAttribLocation__IILjava_lang_String_2
const char* _nativename = 0; const char* _nativename = 0;
if (!name) { if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException"; _exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null"; _exceptionMessage = "name == null";
goto exit; goto exit;
@@ -2454,6 +2455,7 @@ android_glGetAttribLocation__ILjava_lang_String_2
const char* _nativename = 0; const char* _nativename = 0;
if (!name) { if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException"; _exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null"; _exceptionMessage = "name == null";
goto exit; goto exit;
@@ -3602,6 +3604,7 @@ android_glGetUniformLocation__ILjava_lang_String_2
const char* _nativename = 0; const char* _nativename = 0;
if (!name) { if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException"; _exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null"; _exceptionMessage = "name == null";
goto exit; goto exit;

2
core/jni/android_opengl_GLES30.cpp
View File

@@ -2511,6 +2511,7 @@ android_glGetFragDataLocation__ILjava_lang_String_2
const char* _nativename = 0; const char* _nativename = 0;
if (!name) { if (!name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException"; _exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "name == null"; _exceptionMessage = "name == null";
goto exit; goto exit;
@@ -3361,6 +3362,7 @@ android_glGetUniformBlockIndex__ILjava_lang_String_2
const char* _nativeuniformBlockName = 0; const char* _nativeuniformBlockName = 0;
if (!uniformBlockName) { if (!uniformBlockName) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException"; _exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "uniformBlockName == null"; _exceptionMessage = "uniformBlockName == null";
goto exit; goto exit;