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

Commit 87a36a3b authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by Android (Google) Code Review
Browse files

Merge "Making shader compilation errors throw a Java exception."

parents f0451db4 257e8a9a

libs/rs/driver/rsdShader.cpp

+1 −2
Original line number Diff line number Diff line
@@ -195,12 +195,11 @@ bool RsdShader::loadShader(const Context *rsc) { 
                char* buf = (char*) malloc(infoLen);

                if (buf) {

                    RSD_CALL_GL(glGetShaderInfoLog, mShaderID, infoLen, NULL, buf);

                    ALOGE("Could not compile shader \n%s\n", buf);

                    rsc->setError(RS_ERROR_FATAL_PROGRAM_LINK, buf);

                    free(buf);

                }

                RSD_CALL_GL(glDeleteShader, mShaderID);

                mShaderID = 0;

                rsc->setError(RS_ERROR_BAD_SHADER, "Error returned from GL driver loading shader text,");

                return false;

            }

        }

libs/rs/driver/rsdShaderCache.cpp

+1 −2
Original line number Diff line number Diff line
@@ -167,12 +167,11 @@ bool RsdShaderCache::link(const Context *rsc) { 
                char* buf = (char*) malloc(bufLength);

                if (buf) {

                    glGetProgramInfoLog(pgm, bufLength, NULL, buf);

                    ALOGE("Could not link program:\n%s\n", buf);

                    rsc->setError(RS_ERROR_FATAL_PROGRAM_LINK, buf);

                    free(buf);

                }

            }

            glDeleteProgram(pgm);

            rsc->setError(RS_ERROR_FATAL_PROGRAM_LINK, "Error linking GL Programs");

            return false;

        }