diff options
author | bsalomon <bsalomon@google.com> | 2014-07-08 06:52:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-07-08 06:52:35 -0700 |
commit | 97b9ab72cd5ee0cba4692082737266376425f27c (patch) | |
tree | 3061ad5cf5cb7cc81f4e5ee3014597ae1bf4dbab /src/gpu/GrEffect.cpp | |
parent | 4ae94ffce5ecf1b71cb5e295b68bf4ec9e697443 (diff) |
Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*.
Make Sk-effect virtuals produce GrEffect* rather than GrEffectRef*
Make GrEffectRef a typedef for GrEffect.
Committed: https://skia.googlesource.com/skia/+/2011fe9cdfa63b83489a146cea6a724cede352c8
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/377503004
Diffstat (limited to 'src/gpu/GrEffect.cpp')
-rw-r--r-- | src/gpu/GrEffect.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp index 986e80a57e..f952483562 100644 --- a/src/gpu/GrEffect.cpp +++ b/src/gpu/GrEffect.cpp @@ -59,25 +59,7 @@ int32_t GrBackendEffectFactory::fCurrEffectClassID = GrBackendEffectFactory::kIl /////////////////////////////////////////////////////////////////////////////// -GrEffectRef::~GrEffectRef() { - SkASSERT(this->unique()); - fEffect->EffectRefDestroyed(); - fEffect->unref(); -} - -void* GrEffectRef::operator new(size_t size) { - return GrEffect_Globals::GetTLS()->allocate(size); -} - -void GrEffectRef::operator delete(void* target) { - GrEffect_Globals::GetTLS()->release(target); -} - -/////////////////////////////////////////////////////////////////////////////// - -GrEffect::~GrEffect() { - SkASSERT(NULL == fEffectRef); -} +GrEffect::~GrEffect() {} const char* GrEffect::name() const { return this->getFactory().name(); |