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/rsProgramStore.cpp | |
| parent | 4924aee9cb1c5988359f3162b6e89689c5b101e1 (diff) | |
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/rsProgramStore.cpp')
| -rw-r--r-- | libs/rs/rsProgramStore.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/rs/rsProgramStore.cpp b/libs/rs/rsProgramStore.cpp index 586a89fd1f60..876299f7a6ce 100644 --- a/libs/rs/rsProgramStore.cpp +++ b/libs/rs/rsProgramStore.cpp @@ -33,8 +33,6 @@ using namespace android::renderscript; ProgramStore::ProgramStore(Context *rsc) : Program(rsc) { - mAllocFile = __FILE__; - mAllocLine = __LINE__; mDitherEnable = true; mBlendEnable = false; mColorRWriteEnable = true; @@ -236,8 +234,8 @@ ProgramStoreState::ProgramStoreState() ProgramStoreState::~ProgramStoreState() { - delete mPFS; - + ObjectBase::checkDelete(mPFS); + mPFS = NULL; } void ProgramStoreState::init(Context *rsc) @@ -258,9 +256,8 @@ namespace renderscript { void rsi_ProgramStoreBegin(Context * rsc, RsElement in, RsElement out) { - delete rsc->mStateFragmentStore.mPFS; + ObjectBase::checkDelete(rsc->mStateFragmentStore.mPFS); rsc->mStateFragmentStore.mPFS = new ProgramStore(rsc); - } void rsi_ProgramStoreDepthFunc(Context *rsc, RsDepthFunc func) |