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 /rsProgramFragment.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 'rsProgramFragment.cpp')
-rw-r--r-- | rsProgramFragment.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp index 81b4fa48..33399d53 100644 --- a/rsProgramFragment.cpp +++ b/rsProgramFragment.cpp @@ -36,9 +36,6 @@ ProgramFragment::ProgramFragment(Context *rsc, const char * shaderText, uint32_t paramLength) : Program(rsc, shaderText, shaderLength, params, paramLength) { - mAllocFile = __FILE__; - mAllocLine = __LINE__; - mConstantColor[0] = 1.f; mConstantColor[1] = 1.f; mConstantColor[2] = 1.f; @@ -182,8 +179,8 @@ ProgramFragmentState::ProgramFragmentState() ProgramFragmentState::~ProgramFragmentState() { - delete mPF; - + ObjectBase::checkDelete(mPF); + mPF = NULL; } void ProgramFragmentState::init(Context *rsc) |