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

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

Browse Source
This commit is contained in:
Alex Sakhartchouk
2012-02-10 15:00:21 -08:00
committed by Android (Google) Code Review
parent f0451db422 257e8a9a4f
commit 87a36a3b29
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

@@ -195,12 +195,11 @@ bool RsdShader::loadShader(const Context *rsc) {
char* buf = (char*) malloc(infoLen); char* buf = (char*) malloc(infoLen);
if (buf) { if (buf) {
RSD_CALL_GL(glGetShaderInfoLog, mShaderID, infoLen, NULL, 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); free(buf);
} }
RSD_CALL_GL(glDeleteShader, mShaderID); RSD_CALL_GL(glDeleteShader, mShaderID);
mShaderID = 0; mShaderID = 0;
rsc->setError(RS_ERROR_BAD_SHADER, "Error returned from GL driver loading shader text,");
return false; 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); char* buf = (char*) malloc(bufLength);
if (buf) { if (buf) {
glGetProgramInfoLog(pgm, bufLength, NULL, 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); free(buf);
} }
} }
glDeleteProgram(pgm); glDeleteProgram(pgm);
rsc->setError(RS_ERROR_FATAL_PROGRAM_LINK, "Error linking GL Programs");
return false; return false;
} }