Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfd9a2c1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '917f88f0':
  Regenerate all the OpenGL stubs.
parents 3d28abf3 917f88f0

core/jni/android_opengl_GLES20.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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;

core/jni/android_opengl_GLES30.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;