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 | 225afd317e101a7be5fe02c0a86361146ea89f05 (patch) | |
tree | af9ed039287d6a03a6442eb8c8d332f97d0f6e48 /rsAdapter.cpp | |
parent | 1c94845e04e974b22edf07d21ca03337bfb23b7c (diff) | |
download | rs-225afd317e101a7be5fe02c0a86361146ea89f05.tar.gz |
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 'rsAdapter.cpp')
-rw-r--r-- | rsAdapter.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/rsAdapter.cpp b/rsAdapter.cpp index ef69b750..1d1425c2 100644 --- a/rsAdapter.cpp +++ b/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) |