commit a9e7a05b84470257637c97d65f6562aa832c66ef
author Jason Sams <rjsams@android.com> Fri Sep 25 14:51:22 2009 -0700
committer Jason Sams <rjsams@android.com> Fri Sep 25 14:51:22 2009 -0700
tree 04a3175485ae7492c3387003c244953b6880c514
parent a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169

Improve renderscript context teardown.  Track object in the system and then force their cleanup by releasing all user references once destroy context is called.  Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.

libs/rs/rsAllocation.cpp

diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index cb82624..96e128b 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -22,7 +22,7 @@
 using namespace android;
 using namespace android::renderscript;
 
-Allocation::Allocation(const Type *type)
+Allocation::Allocation(Context *rsc, const Type *type) : ObjectBase(rsc)
 {
     mPtr = NULL;
 
@@ -90,7 +90,7 @@
     }
     glBindTexture(GL_TEXTURE_2D, mTextureID);
 
-    Adapter2D adapt(this);
+    Adapter2D adapt(getContext(), this);
     for(uint32_t lod = 0; (lod + lodOffset) < mType->getLODCount(); lod++) {
         adapt.setLOD(lod+lodOffset);
 
@@ -186,14 +186,14 @@
 {
     const Type * type = static_cast<const Type *>(vtype);
 
-    Allocation * alloc = new Allocation(type);
+    Allocation * alloc = new Allocation(rsc, type);
     alloc->incUserRef();
     return alloc;
 }
 
 RsAllocation rsi_AllocationCreateSized(Context *rsc, RsElement e, size_t count)
 {
-    Type * type = new Type();
+    Type * type = new Type(rsc);
     type->setDimX(count);
     type->setElement(static_cast<Element *>(e));
     type->compute();
@@ -371,8 +371,8 @@
     cvt(texAlloc->getPtr(), data, w * h);
 
     if (genMips) {
-        Adapter2D adapt(texAlloc);
-        Adapter2D adapt2(texAlloc);
+        Adapter2D adapt(rsc, texAlloc);
+        Adapter2D adapt2(rsc, texAlloc);
         for(uint32_t lod=0; lod < (texAlloc->getType()->getLODCount() -1); lod++) {
             adapt.setLOD(lod);
             adapt2.setLOD(lod + 1);