diff options
| author | 2010-10-21 21:21:50 -0700 | |
|---|---|---|
| committer | 2010-10-21 21:21:50 -0700 | |
| commit | 477d9b2ddc9515e0df088c448ddfb6f9145edce1 (patch) | |
| tree | 247292ebbf967e7e4fe4fe9a70a1381467015204 /libs/rs/rsProgramFragment.cpp | |
| parent | cde1ac6006689294dedee5260519dbd3d34971ea (diff) | |
| parent | b38d534873ca514f5a5230596c838aa37eca1568 (diff) | |
Merge "Fix refcounting bugs where the sys refcount could be corrupted during async type creation."
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
| -rw-r--r-- | libs/rs/rsProgramFragment.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp index 81b4fa48f322..33399d531293 100644 --- a/libs/rs/rsProgramFragment.cpp +++ b/libs/rs/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) |