drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Properly recover from failed compilation."

Browse Source
This commit is contained in:
Stephen Hines
2012-02-02 21:25:19 -08:00
committed by Android (Google) Code Review
parent c7aab1a9f1 862dadb7a7
commit cc2daede56
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/renderscript/RenderScript.java
View File

@ -837,7 +837,7 @@ public class RenderScript {
mRS.mErrorCallback.mErrorNum = subID; mRS.mErrorCallback.mErrorNum = subID;
mRS.mErrorCallback.run(); mRS.mErrorCallback.run();
} else { } else {
//throw new RSRuntimeException("Received error num " + subID + ", details: " + e); throw new RSRuntimeException("Received error num " + subID + ", details: " + e);
} }
continue; continue;
} }

2
libs/rs/rsScriptC.cpp
View File

@ -322,7 +322,7 @@ RsScript rsi_ScriptCCreate(Context *rsc,
if (!s->runCompiler(rsc, resName, cacheDir, (uint8_t *)text, text_length)) { if (!s->runCompiler(rsc, resName, cacheDir, (uint8_t *)text, text_length)) {
// Error during compile, destroy s and return null. // Error during compile, destroy s and return null.
delete s; ObjectBase::checkDelete(s);
return NULL; return NULL;
} }