Index: include/gpu/GrEffectStage.h |
diff --git a/include/gpu/GrEffectStage.h b/include/gpu/GrEffectStage.h |
index a3ae9a8c516e55762d4dc2e925767ed6a2df32ad..4fe7965d092c1c8f10ba1f247349bb72bf8ff280 100644 |
--- a/include/gpu/GrEffectStage.h |
+++ b/include/gpu/GrEffectStage.h |
@@ -85,7 +85,7 @@ public: |
private: |
bool fCoordChangeMatrixSet; |
SkMatrix fCoordChangeMatrix; |
robertphillips
2014/09/08 15:38:09
mutable ?
init to SK_InvalidUniqueID ?
|
- SkDEBUGCODE(mutable SkAutoTUnref<const GrEffect> fEffect;) |
+ SkDEBUGCODE(uint32_t fEffectUniqueID;) |
friend class GrEffectStage; |
}; |
@@ -101,9 +101,7 @@ public: |
if (fCoordChangeMatrixSet) { |
savedCoordChange->fCoordChangeMatrix = fCoordChangeMatrix; |
} |
robertphillips
2014/09/08 15:38:09
SkASSERT(SK_InvalidUniqueID == saveCoordChange->fE
|
- SkASSERT(NULL == savedCoordChange->fEffect.get()); |
- SkDEBUGCODE(SkRef(fEffect.get());) |
- SkDEBUGCODE(savedCoordChange->fEffect.reset(fEffect.get());) |
+ SkDEBUGCODE(savedCoordChange->fEffectUniqueID = fEffect->getUniqueID();) |
} |
/** |
@@ -114,8 +112,7 @@ public: |
if (fCoordChangeMatrixSet) { |
fCoordChangeMatrix = savedCoordChange.fCoordChangeMatrix; |
} |
- SkASSERT(savedCoordChange.fEffect.get() == fEffect); |
- SkDEBUGCODE(savedCoordChange.fEffect.reset(NULL);) |
+ SkASSERT(savedCoordChange.fEffectUniqueID == fEffect->getUniqueID()); |
robertphillips
2014/09/08 15:38:09
SkDEBUGCODE(savedCoordChange.fEffectUniqueID = SK_
|
} |
/** |