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

Commit 552ef6fa authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Add fallback case in glGetShaderInfoLog"

parents 8650c6fe 7eb9c3a4
Loading
Loading
Loading
Loading
+4 −3
Original line number Original line Diff line number Diff line
@@ -5,15 +5,16 @@ static jstring android_glGetShaderInfoLog(JNIEnv *_env, jobject, jint shader) {
    GLint infoLen = 0;
    GLint infoLen = 0;
    glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
    glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
    if (!infoLen) {
    if (!infoLen) {
        return _env->NewStringUTF("");
        infoLen = 512;
    }
    }
    char* buf = (char*) malloc(infoLen);
    char* buf = (char*) malloc(infoLen);
    if (buf == NULL) {
    if (buf == NULL) {
        jniThrowException(_env, "java/lang/IllegalArgumentException", "out of memory");
        jniThrowException(_env, "java/lang/IllegalArgumentException", "out of memory");
        return NULL;
        return NULL;
    }
    }
    glGetShaderInfoLog(shader, infoLen, NULL, buf);
    GLsizei outLen = 0;
    jstring result = _env->NewStringUTF(buf);
    glGetShaderInfoLog(shader, infoLen, &outLen, buf);
    jstring result = _env->NewStringUTF(outLen == 0 ? "" : buf);
    free(buf);
    free(buf);
    return result;
    return result;
}
}