diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2012-02-10 15:00:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-10 15:00:21 -0800 |
| commit | 87a36a3b291e78a612d2d08c14b245ff970080e0 (patch) | |
| tree | 166267d6dc9a5f95db6b69c3a8b196d03ffb226f /libs/rs | |
| parent | f0451db4224e2b6360efa39cd65c88cd391f14e0 (diff) | |
| parent | 257e8a9a4f28a733c2aec8d895d4b90a2107a1ca (diff) | |
| download | frameworks_base-87a36a3b291e78a612d2d08c14b245ff970080e0.zip frameworks_base-87a36a3b291e78a612d2d08c14b245ff970080e0.tar.gz frameworks_base-87a36a3b291e78a612d2d08c14b245ff970080e0.tar.bz2 | |
Merge "Making shader compilation errors throw a Java exception."
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/driver/rsdShader.cpp | 3 | ||||
| -rw-r--r-- | 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 482f3b8..056a33a 100644 --- a/libs/rs/driver/rsdShader.cpp +++ b/libs/rs/driver/rsdShader.cpp @@ -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; } } diff --git a/libs/rs/driver/rsdShaderCache.cpp b/libs/rs/driver/rsdShaderCache.cpp index f6236e7..89d3c45 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; } |