diff options
| author | Jason Sams <rjsams@android.com> | 2010-10-21 14:06:55 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-10-21 21:17:30 -0700 |
| commit | b38d534873ca514f5a5230596c838aa37eca1568 (patch) | |
| tree | 4473cccf239e0a97597db92052508b2149309ad1 /libs/rs/rsAdapter.cpp | |
| parent | 4924aee9cb1c5988359f3162b6e89689c5b101e1 (diff) | |
| download | frameworks_base-b38d534873ca514f5a5230596c838aa37eca1568.zip frameworks_base-b38d534873ca514f5a5230596c838aa37eca1568.tar.gz frameworks_base-b38d534873ca514f5a5230596c838aa37eca1568.tar.bz2 | |
Fix refcounting bugs where the sys refcount
could be corrupted during async type creation.
Change-Id: If42828e92990598b0cb5da81c82ea513f94725f2
Fix stack object deletion bug.
Change-Id: I2c723aa5ad15e0c99dc9cd0cfbc7db80bace172a
Diffstat (limited to 'libs/rs/rsAdapter.cpp')
| -rw-r--r-- | libs/rs/rsAdapter.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libs/rs/rsAdapter.cpp b/libs/rs/rsAdapter.cpp index ef69b75..1d1425c 100644 --- a/libs/rs/rsAdapter.cpp +++ b/libs/rs/rsAdapter.cpp @@ -27,15 +27,11 @@ using namespace android::renderscript; Adapter1D::Adapter1D(Context *rsc) : ObjectBase(rsc) { - mAllocFile = __FILE__; - mAllocLine = __LINE__; reset(); } Adapter1D::Adapter1D(Context *rsc, Allocation *a) : ObjectBase(rsc) { - mAllocFile = __FILE__; - mAllocLine = __LINE__; reset(); setAllocation(a); } @@ -76,7 +72,7 @@ void Adapter1D::data(const void *data) void Adapter1D::serialize(OStream *stream) const { - + } Adapter1D *Adapter1D::createFromStream(Context *rsc, IStream *stream) @@ -145,15 +141,11 @@ void rsi_Adapter1DData(Context *rsc, RsAdapter1D va, const void *data) Adapter2D::Adapter2D(Context *rsc) : ObjectBase(rsc) { - mAllocFile = __FILE__; - mAllocLine = __LINE__; reset(); } Adapter2D::Adapter2D(Context *rsc, Allocation *a) : ObjectBase(rsc) { - mAllocFile = __FILE__; - mAllocLine = __LINE__; reset(); setAllocation(a); } @@ -200,7 +192,7 @@ void Adapter2D::data(const void *data) void Adapter2D::serialize(OStream *stream) const { - + } Adapter2D *Adapter2D::createFromStream(Context *rsc, IStream *stream) |