From 257e8a9a4f28a733c2aec8d895d4b90a2107a1ca Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Tue, 7 Feb 2012 18:06:13 -0800 Subject: [PATCH] Making shader compilation errors throw a Java exception. Change-Id: I612142b6fe1b75eab62e89950c3bea6f326cb730 --- libs/rs/driver/rsdShader.cpp | 3 +-- libs/rs/driver/rsdShaderCache.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/rs/driver/rsdShader.cpp b/libs/rs/driver/rsdShader.cpp index c70193aead197..62b5b46354fac 100644 --- a/libs/rs/driver/rsdShader.cpp +++ b/libs/rs/driver/rsdShader.cpp @@ -190,12 +190,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; } } diff --git a/libs/rs/driver/rsdShaderCache.cpp b/libs/rs/driver/rsdShaderCache.cpp index f6236e794a072..89d3c45177fa3 100644 --- a/libs/rs/driver/rsdShaderCache.cpp +++ b/libs/rs/driver/rsdShaderCache.cpp @@ -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; }