diff options
| author |  bsalomon <bsalomon@google.com> | 2014-09-05 12:23:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-05 12:23:12 -0700 |
| commit | 52e9d63f7110ac691609660342cdab32082a4235 (patch) | |
| tree | fa7bf3b7a534588d99bf049fb3b8cc4d20cd15ff /src/gpu/GrDrawState.cpp | |
| parent | 5a80be22418176a2d15b0d3bd33215e28b516b24 (diff) | |
Don't take a ref on GP in AutoEffectRestore.
BUG=skia:2889
R=joshualitt@chromium.org, robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/546043002
Diffstat (limited to 'src/gpu/GrDrawState.cpp')
| -rw-r--r-- | src/gpu/GrDrawState.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp index 6acc202065..f2028eaf94 100644 --- a/src/gpu/GrDrawState.cpp +++ b/src/gpu/GrDrawState.cpp @@ -300,12 +300,12 @@ GrDrawState::AutoVertexAttribRestore::AutoVertexAttribRestore( void GrDrawState::AutoRestoreEffects::set(GrDrawState* ds) { if (NULL != fDrawState) { // See the big comment on the class definition about GPs. - if (NULL != fOriginalGP) { - SkASSERT(fDrawState->getGeometryProcessor()->getEffect() == fOriginalGP); - fOriginalGP->unref(); - fOriginalGP = NULL; - } else { + if (SK_InvalidUniqueID == fOriginalGPID) { fDrawState->fGeometryProcessor.reset(NULL); + } else { + SkASSERT(fDrawState->getGeometryProcessor()->getEffect()->getUniqueID() == + fOriginalGPID); + fOriginalGPID = SK_InvalidUniqueID; } int m = fDrawState->numColorStages() - fColorEffectCnt; @@ -322,9 +322,9 @@ void GrDrawState::AutoRestoreEffects::set(GrDrawState* ds) { } fDrawState = ds; if (NULL != ds) { - SkASSERT(NULL == fOriginalGP); + SkASSERT(SK_InvalidUniqueID == fOriginalGPID); if (NULL != ds->getGeometryProcessor()) { - fOriginalGP = SkRef(ds->getGeometryProcessor()->getEffect()); + fOriginalGPID = ds->getGeometryProcessor()->getEffect()->getUniqueID(); } fColorEffectCnt = ds->numColorStages(); fCoverageEffectCnt = ds->numCoverageStages(); |