diff options
-rw-r--r-- | rs.spec | 6 | ||||
-rw-r--r-- | rsScript.cpp | 22 | ||||
-rw-r--r-- | rsScript.h | 1 |
3 files changed, 29 insertions, 0 deletions
@@ -280,6 +280,12 @@ ScriptSetVarI { param int value } +ScriptSetVarObj { + param RsScript s + param uint32_t slot + param RsObjectBase value + } + ScriptSetVarJ { param RsScript s param uint32_t slot diff --git a/rsScript.cpp b/rsScript.cpp index 4ffdbfdc..efdc6260 100644 --- a/rsScript.cpp +++ b/rsScript.cpp @@ -67,6 +67,22 @@ void Script::setVar(uint32_t slot, const void *val, uint32_t len) { } } +void Script::setVarObj(uint32_t slot, ObjectBase *val) { + ObjectBase **destPtr = ((ObjectBase ***)mEnviroment.mFieldAddress)[slot]; + + if (destPtr) { + if (val != NULL) { + val->incSysRef(); + } + if (*destPtr) { + (*destPtr)->decSysRef(); + } + *destPtr = val; + } else { + LOGV("Calling setVarObj on slot = %i which is null. This is dangerous because the script will not hold a ref count on the object.", slot); + } +} + namespace android { namespace renderscript { @@ -103,6 +119,12 @@ void rsi_ScriptSetVarI(Context *rsc, RsScript vs, uint32_t slot, int value) { s->setVar(slot, &value, sizeof(value)); } +void rsi_ScriptSetVarObj(Context *rsc, RsScript vs, uint32_t slot, RsObjectBase value) { + Script *s = static_cast<Script *>(vs); + ObjectBase *o = static_cast<ObjectBase *>(value); + s->setVarObj(slot, o); +} + void rsi_ScriptSetVarJ(Context *rsc, RsScript vs, uint32_t slot, long long value) { Script *s = static_cast<Script *>(vs); s->setVar(slot, &value, sizeof(value)); @@ -61,6 +61,7 @@ public: void initSlots(); void setSlot(uint32_t slot, Allocation *a); void setVar(uint32_t slot, const void *val, uint32_t len); + void setVarObj(uint32_t slot, ObjectBase *val); virtual void runForEach(Context *rsc, const Allocation * ain, |