diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkBitmapProcShader.cpp | 4 | ||||
-rw-r--r-- | src/core/SkBitmapProcShader.h | 2 | ||||
-rw-r--r-- | src/core/SkColorFilter.cpp | 2 | ||||
-rw-r--r-- | src/core/SkImageFilter.cpp | 2 | ||||
-rw-r--r-- | src/core/SkShader.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index aa790717a1..2f7173e446 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -335,7 +335,7 @@ void SkBitmapProcShader::toString(SkString* str) const { #include "effects/GrSingleTextureEffect.h" #include "SkGr.h" -GrEffect* SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& paint) const { +GrEffectRef* SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& paint) const { SkMatrix matrix; matrix.setIDiv(fRawBitmap.width(), fRawBitmap.height()); @@ -360,7 +360,7 @@ GrEffect* SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& pai return NULL; } - GrEffect* effect = SkNEW_ARGS(GrSingleTextureEffect, (texture, matrix, params)); + GrEffectRef* effect = GrSingleTextureEffect::Create(texture, matrix, params); GrUnlockCachedBitmapTexture(texture); return effect; } diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h index 0cff88ca17..5a599c3b92 100644 --- a/src/core/SkBitmapProcShader.h +++ b/src/core/SkBitmapProcShader.h @@ -33,7 +33,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapProcShader) #if SK_SUPPORT_GPU - GrEffect* asNewEffect(GrContext*, const SkPaint&) const SK_OVERRIDE; + GrEffectRef* asNewEffect(GrContext*, const SkPaint&) const SK_OVERRIDE; #endif protected: diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index 90e8df84f3..383397dbca 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -41,7 +41,7 @@ SkColor SkColorFilter::filterColor(SkColor c) const { return SkUnPreMultiply::PMColorToColor(dst); } -GrEffect* SkColorFilter::asNewEffect(GrContext*) const { +GrEffectRef* SkColorFilter::asNewEffect(GrContext*) const { return NULL; } diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index a8edbf42bc..fddb5befd0 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -117,7 +117,7 @@ bool SkImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm, return true; } -bool SkImageFilter::asNewEffect(GrEffect**, GrTexture*) const { +bool SkImageFilter::asNewEffect(GrEffectRef**, GrTexture*) const { return false; } diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index d895801ba4..d51c2ef530 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -173,7 +173,7 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const { return kNone_GradientType; } -GrEffect* SkShader::asNewEffect(GrContext*, const SkPaint&) const { +GrEffectRef* SkShader::asNewEffect(GrContext*, const SkPaint&) const { return NULL; } |