Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 87a36a3b: Merge "Making shader compilation errors throw a Java exception."

Browse Source 
* commit '87a36a3b291e78a612d2d08c14b245ff970080e0':
  Making shader compilation errors throw a Java exception.
This commit is contained in:
Alex Sakhartchouk
2012-02-10 15:30:48 -08:00
committed by Android Git Automerger
parent aa21b7c1bc 87a36a3b29
commit ff3de0e5d9
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/rs/driver/rsdShader.cpp
View File

@@ -191,12 +191,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;
}
}

3
libs/rs/driver/rsdShaderCache.cpp
View File

@@ -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;
}