From b38d534873ca514f5a5230596c838aa37eca1568 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Thu, 21 Oct 2010 14:06:55 -0700 Subject: 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 --- libs/rs/rsProgramFragment.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libs/rs/rsProgramFragment.cpp') 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) -- cgit v1.2.3-59-g8ed1b