diff options
| author | Tim Murray <timmurray@google.com> | 2014-07-08 23:14:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-02 20:49:53 +0000 |
| commit | 8c8eb23d31768bca01e2fd69c3931aeda31f3329 (patch) | |
| tree | 8b62d216582d173b9eaf0fd731ab388a2f7432e7 /cpu_ref/rsCpuScript.cpp | |
| parent | 60506d94c399dea8b6325000be27b07fed67852a (diff) | |
| parent | a36c50a6ab87f4c9049318d4c6c8ec7b0a1e6e12 (diff) | |
Merge "Add 64bit large object support"
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
| -rw-r--r-- | cpu_ref/rsCpuScript.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp index b9f8aba8..c4fec9f1 100644 --- a/cpu_ref/rsCpuScript.cpp +++ b/cpu_ref/rsCpuScript.cpp @@ -1237,11 +1237,6 @@ void RsdCpuScriptImpl::setGlobalObj(uint32_t slot, ObjectBase *data) { //rsAssert(script->mFieldIsObject[slot]); //ALOGE("setGlobalObj %p %p %i %p", dc, script, slot, data); - //if (mIntrinsicID) { - //mIntrinsicFuncs.setVarObj(dc, script, drv->mIntrinsicData, slot, alloc); - //return; - //} - #ifndef RS_COMPATIBILITY_LIB int32_t *destPtr = reinterpret_cast<int32_t *>( mExecutable->getExportVarAddrs()[slot]); @@ -1277,7 +1272,7 @@ RsdCpuScriptImpl::~RsdCpuScriptImpl() { ObjectBase **obj_addr = reinterpret_cast<ObjectBase **>(*var_addr_iter); if (*is_object_iter) { - if (*var_addr_iter != NULL) { + if (*var_addr_iter != NULL && mCtx->getContext() != NULL) { rsrClearObject(mCtx->getContext(), obj_addr); } } |