summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2011-04-11 14:02:22 -0700
committerStephen Hines <srhines@google.com>2011-04-11 14:02:22 -0700
commit97837c917227e7863573c385b9d2405f7cfd135a (patch)
tree882ff7bf82a3a545089fa6cd84adc7f6bda10767 /libs/rs
parent6eb3c59cfed2993dad68fbd934c49009a1e6b47d (diff)
downloadframeworks_base-97837c917227e7863573c385b9d2405f7cfd135a.zip
frameworks_base-97837c917227e7863573c385b9d2405f7cfd135a.tar.gz
frameworks_base-97837c917227e7863573c385b9d2405f7cfd135a.tar.bz2
Fix broken assert (if input allocation is NULL).
Change-Id: If02e86eee4ec059402edd6f8c408fd89b248bc80
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/driver/rsdBcc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/driver/rsdBcc.cpp b/libs/rs/driver/rsdBcc.cpp
index 6c5a55b..20aef49 100644
--- a/libs/rs/driver/rsdBcc.cpp
+++ b/libs/rs/driver/rsdBcc.cpp
@@ -381,7 +381,7 @@ void rsdScriptInvokeForEach(const Context *rsc,
mtls.zEnd = rsMax((uint32_t)1, mtls.zEnd);
mtls.arrayEnd = rsMax((uint32_t)1, mtls.arrayEnd);
- rsAssert(ain->getType()->getDimZ() == 0);
+ rsAssert(!ain || (ain->getType()->getDimZ() == 0));
Context *mrsc = (Context *)rsc;
Script * oldTLS = setTLS(s);