summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2011-10-04 15:53:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-04 15:53:37 -0700
commit3c1951c442e40f7f46775acfc8a22c24f04d8cfc (patch)
tree00c820bf0c44209aae88af9a5231d9874850e920
parentf0f2ff1a5ba1f7d3ff30db3099efeaae71c01db1 (diff)
parent795072ec7b489c84ce233be586d1ae85ffed8cd3 (diff)
downloadframeworks_base-3c1951c442e40f7f46775acfc8a22c24f04d8cfc.zip
frameworks_base-3c1951c442e40f7f46775acfc8a22c24f04d8cfc.tar.gz
frameworks_base-3c1951c442e40f7f46775acfc8a22c24f04d8cfc.tar.bz2
Merge "Fix crash running old HC apps."
-rw-r--r--libs/rs/driver/rsdBcc.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/rs/driver/rsdBcc.cpp b/libs/rs/driver/rsdBcc.cpp
index 0755fb7..5fd5c35 100644
--- a/libs/rs/driver/rsdBcc.cpp
+++ b/libs/rs/driver/rsdBcc.cpp
@@ -302,7 +302,10 @@ void rsdScriptInvokeForEach(const Context *rsc,
DrvScript *drv = (DrvScript *)s->mHal.drv;
// We only support slot 0 (root) at this point in time.
rsAssert(slot == 0);
- mtls.sig = drv->mExportForEachSignatureList[slot];
+ mtls.sig = 0x1f; // temp fix for old apps, full table in slang_rs_export_foreach.cpp
+ if (drv->mExportForEachSignatureList) {
+ mtls.sig = drv->mExportForEachSignatureList[slot];
+ }
if (ain) {
mtls.dimX = ain->getType()->getDimX();
mtls.dimY = ain->getType()->getDimY();