diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-16 15:51:47 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-16 15:51:47 +0000 |
| commit | a1ebbe447d5eab098111eb83580e55f2f5f6faca (patch) | |
| tree | 87613d55e9e80f47a65ef09b033b5665ea4a1b1d /src/gpu/effects | |
| parent | 87c472653be9be8909c9ea0a86a509e90c0cb469 (diff) | |
Change some function/vars from EffectPtr to EffectRef to reflect GrEffectPtr->GrEffectRef renaming.
git-svn-id: http://skia.googlecode.com/svn/trunk@7226 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 10 | ||||
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.h | 4 | ||||
| -rw-r--r-- | src/gpu/effects/GrSingleTextureEffect.h | 6 | ||||
| -rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.cpp | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index a547c1a2da..5e99dad601 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -139,7 +139,7 @@ GrEffectRef* GrConfigConversionEffect::TestCreate(SkRandom* random, swapRB, pmConv, GrEffectUnitTest::TestMatrix(random)))); - return CreateEffectPtr(effect); + return CreateEffectRef(effect); } /////////////////////////////////////////////////////////////////////////////// @@ -219,9 +219,9 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context *pmToUPMRule, SkMatrix::I()))); - SkAutoTUnref<GrEffectRef> pmToUPMEffect1(CreateEffectPtr(pmToUPM1)); - SkAutoTUnref<GrEffectRef> upmToPMEffect(CreateEffectPtr(upmToPM)); - SkAutoTUnref<GrEffectRef> pmToUPMEffect2(CreateEffectPtr(pmToUPM2)); + SkAutoTUnref<GrEffectRef> pmToUPMEffect1(CreateEffectRef(pmToUPM1)); + SkAutoTUnref<GrEffectRef> upmToPMEffect(CreateEffectRef(upmToPM)); + SkAutoTUnref<GrEffectRef> pmToUPMEffect2(CreateEffectRef(pmToUPM2)); context->setRenderTarget(readTex->asRenderTarget()); paint.colorStage(0)->setEffect(pmToUPMEffect1); @@ -276,7 +276,7 @@ bool GrConfigConversionEffect::InstallEffect(GrTexture* texture, swapRedAndBlue, pmConversion, matrix))); - stage->setEffect(CreateEffectPtr(effect))->unref(); + stage->setEffect(CreateEffectRef(effect))->unref(); return true; } } diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index ff661b2adb..4f0c9eca93 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -27,7 +27,7 @@ public: dir, halfWidth, kernel))); - return CreateEffectPtr(effect); + return CreateEffectRef(effect); } /// Convolve with a Gaussian kernel @@ -39,7 +39,7 @@ public: dir, halfWidth, gaussianSigma))); - return CreateEffectPtr(effect); + return CreateEffectRef(effect); } virtual ~GrConvolutionEffect(); diff --git a/src/gpu/effects/GrSingleTextureEffect.h b/src/gpu/effects/GrSingleTextureEffect.h index fad2c21239..e475cb5751 100644 --- a/src/gpu/effects/GrSingleTextureEffect.h +++ b/src/gpu/effects/GrSingleTextureEffect.h @@ -23,18 +23,18 @@ public: /* unfiltered, clamp mode */ static GrEffectRef* Create(GrTexture* tex, const SkMatrix& matrix) { SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrSingleTextureEffect, (tex, matrix))); - return CreateEffectPtr(effect); + return CreateEffectRef(effect); } /* clamp mode */ static GrEffectRef* Create(GrTexture* tex, const SkMatrix& matrix, bool bilerp) { SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrSingleTextureEffect, (tex, matrix, bilerp))); - return CreateEffectPtr(effect); + return CreateEffectRef(effect); } static GrEffectRef* Create(GrTexture* tex, const SkMatrix& matrix, const GrTextureParams& p) { SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrSingleTextureEffect, (tex, matrix, p))); - return CreateEffectPtr(effect); + return CreateEffectRef(effect); } virtual ~GrSingleTextureEffect(); diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index 74727a05c5..f82c62f3ff 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -148,7 +148,7 @@ GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture, clippedDomain, wrapMode, bilerp))); - return CreateEffectPtr(effect); + return CreateEffectRef(effect); } } |