diff options
| author | Jason Sams <rjsams@android.com> | 2010-11-16 14:24:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-16 14:24:40 -0800 |
| commit | db42351b0f0972cd4622c6f827e99391c5d41a5c (patch) | |
| tree | 319efa47ca81e2c154439549b177f0fdc1e7cab8 | |
| parent | c50f1505aa17a27d9063218335db55d71ba42e09 (diff) | |
| parent | 7a21ee61484e7c55f8642231362821058104a49d (diff) | |
| download | frameworks_base-db42351b0f0972cd4622c6f827e99391c5d41a5c.zip frameworks_base-db42351b0f0972cd4622c6f827e99391c5d41a5c.tar.gz frameworks_base-db42351b0f0972cd4622c6f827e99391c5d41a5c.tar.bz2 | |
Merge "Fix crash with extended debugging."
| -rw-r--r-- | libs/rs/rsScriptC.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp index 033f316..072cc16 100644 --- a/libs/rs/rsScriptC.cpp +++ b/libs/rs/rsScriptC.cpp @@ -65,12 +65,11 @@ void ScriptC::setupScript(Context *rsc) { void **dest = ((void ***)mEnviroment.mFieldAddress)[ct]; if (rsc->props.mLogScripts) { - LOGV("%p ScriptC::setupScript slot=%i dst=%p src=%p type=%p", rsc, ct, dest, ptr, mSlots[ct]->getType()); - - //const uint32_t *p32 = (const uint32_t *)ptr; - //for (uint32_t ct2=0; ct2 < mSlots[ct]->getType()->getDimX(); ct2++) { - //LOGE(" %i = 0x%08x ", ct2, p32[ct2]); - //} + if (mSlots[ct].get() != NULL) { + LOGV("%p ScriptC::setupScript slot=%i dst=%p src=%p type=%p", rsc, ct, dest, ptr, mSlots[ct]->getType()); + } else { + LOGV("%p ScriptC::setupScript slot=%i dst=%p src=%p type=null", rsc, ct, dest, ptr); + } } if (dest) { |