From 2011fe9cdfa63b83489a146cea6a724cede352c8 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Mon, 7 Jul 2014 15:11:31 -0700 Subject: Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. Make Sk-effect virtuals produce GrEffect* rather than GrEffectRef* Make GrEffectRef a typedef for GrEffect. R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/377503004 --- src/effects/SkAlphaThresholdFilter.cpp | 4 ++-- src/effects/SkColorFilters.cpp | 4 ++-- src/effects/SkLumaColorFilter.cpp | 2 +- src/effects/SkPerlinNoiseShader.cpp | 4 ++-- src/effects/SkTableColorFilter.cpp | 2 +- src/effects/gradients/SkLinearGradient.cpp | 2 +- src/effects/gradients/SkLinearGradient.h | 2 +- src/effects/gradients/SkRadialGradient.cpp | 2 +- src/effects/gradients/SkRadialGradient.h | 2 +- src/effects/gradients/SkSweepGradient.cpp | 2 +- src/effects/gradients/SkSweepGradient.h | 2 +- src/effects/gradients/SkTwoPointConicalGradient.cpp | 2 +- src/effects/gradients/SkTwoPointConicalGradient.h | 2 +- src/effects/gradients/SkTwoPointConicalGradient_gpu.h | 6 +++--- src/effects/gradients/SkTwoPointRadialGradient.cpp | 2 +- src/effects/gradients/SkTwoPointRadialGradient.h | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/effects') diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 6fcd2b4351..0bc906dae9 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -24,7 +24,7 @@ protected: virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool asNewEffect(GrEffectRef** effect, GrTexture* texture, + virtual bool asNewEffect(GrEffect** effect, GrTexture* texture, const SkMatrix& matrix, const SkIRect& bounds) const SK_OVERRIDE; #endif @@ -248,7 +248,7 @@ SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(const SkRegion& region, } #if SK_SUPPORT_GPU -bool SkAlphaThresholdFilterImpl::asNewEffect(GrEffectRef** effect, GrTexture* texture, +bool SkAlphaThresholdFilterImpl::asNewEffect(GrEffect** effect, GrTexture* texture, const SkMatrix& in_matrix, const SkIRect&) const { if (effect) { GrContext* context = texture->getContext(); diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index 81d70a7ff9..bee3a50f3b 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -87,7 +87,7 @@ public: #endif #if SK_SUPPORT_GPU - virtual GrEffectRef* asNewEffect(GrContext*) const SK_OVERRIDE; + virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE; #endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter) @@ -409,7 +409,7 @@ GrEffectRef* ModeColorFilterEffect::TestCreate(SkRandom* rand, return ModeColorFilterEffect::Create(color, mode); } -GrEffectRef* SkModeColorFilter::asNewEffect(GrContext*) const { +GrEffect* SkModeColorFilter::asNewEffect(GrContext*) const { if (SkXfermode::kDst_Mode != fMode) { return ModeColorFilterEffect::Create(SkColor2GrColor(fColor), fMode); } diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index ae8b905645..4c90f3d4f4 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -121,7 +121,7 @@ private: } }; -GrEffectRef* SkLumaColorFilter::asNewEffect(GrContext*) const { +GrEffect* SkLumaColorFilter::asNewEffect(GrContext*) const { return LumaColorFilterEffect::Create(); } #endif diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 7f0127ea5a..502cc0764b 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -946,7 +946,7 @@ void GrGLPerlinNoise::setData(const GrGLUniformManager& uman, const GrDrawEffect bool SkPerlinNoiseShader::asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* externalLocalMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + GrEffect** grEffect) const { SkASSERT(NULL != context); *grColor = SkColor2GrColorJustAlpha(paint.getColor()); @@ -1011,7 +1011,7 @@ bool SkPerlinNoiseShader::asNewEffect(GrContext* context, const SkPaint& paint, bool SkPerlinNoiseShader::asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* externalLocalMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + GrEffect** grEffect) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 6a9ab10795..771d2fa0d3 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -43,7 +43,7 @@ public: virtual bool asComponentTable(SkBitmap* table) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrEffectRef* asNewEffect(GrContext* context) const SK_OVERRIDE; + virtual GrEffect* asNewEffect(GrContext* context) const SK_OVERRIDE; #endif virtual void filterSpan(const SkPMColor src[], int count, diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 72b9d4792f..768623a2b0 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -579,7 +579,7 @@ bool SkLinearGradient::asNewEffect(GrContext* context, const SkPaint& paint, bool SkLinearGradient::asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + GrEffect** grEffect) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h index f412a6897d..bb64188251 100644 --- a/src/effects/gradients/SkLinearGradient.h +++ b/src/effects/gradients/SkLinearGradient.h @@ -31,7 +31,7 @@ public: virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, - GrColor* grColor, GrEffectRef** grEffect) const SK_OVERRIDE; + GrColor* grColor, GrEffect** grEffect) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient) diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index f0cb1612b0..38e6f33b38 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -591,7 +591,7 @@ bool SkRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint, bool SkRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + GrEffect** grEffect) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h index 197c967f4d..ac79a57d52 100644 --- a/src/effects/gradients/SkRadialGradient.h +++ b/src/effects/gradients/SkRadialGradient.h @@ -33,7 +33,7 @@ public: SkMatrix* matrix, TileMode* xy) const SK_OVERRIDE; virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffectRef**) const SK_OVERRIDE; + virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffect**) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRadialGradient) diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 154e3a2f13..3b54ac8ae9 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -310,7 +310,7 @@ bool SkSweepGradient::asNewEffect(GrContext* context, const SkPaint& paint, bool SkSweepGradient::asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + GrEffect** grEffect) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h index 0b12e718ea..7404ac7436 100644 --- a/src/effects/gradients/SkSweepGradient.h +++ b/src/effects/gradients/SkSweepGradient.h @@ -35,7 +35,7 @@ public: virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; - virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffectRef**) + virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffect**) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 4421b90a3a..6678000c90 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -396,7 +396,7 @@ bool SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint& p bool SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + GrEffect** grEffect) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h index f345d08e31..bff377ee79 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.h +++ b/src/effects/gradients/SkTwoPointConicalGradient.h @@ -66,7 +66,7 @@ public: TileMode* xy) const; virtual SkShader::GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor* grColor, - GrEffectRef**) const SK_OVERRIDE; + GrEffect**) const SK_OVERRIDE; virtual bool isOpaque() const SK_OVERRIDE; SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); } diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h b/src/effects/gradients/SkTwoPointConicalGradient_gpu.h index 2b0f0612d7..4471ffc89c 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.h +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.h @@ -10,7 +10,7 @@ #include "SkGradientShaderPriv.h" -class GrEffectRef; +class GrEffect; class SkTwoPointConicalGradient; namespace Gr2PtConicalGradientEffect { @@ -18,8 +18,8 @@ namespace Gr2PtConicalGradientEffect { * Creates an effect that produces a two point conical gradient based on the * shader passed in. */ - GrEffectRef* Create(GrContext* ctx, const SkTwoPointConicalGradient& shader, - SkShader::TileMode tm, const SkMatrix* localMatrix); + GrEffect* Create(GrContext* ctx, const SkTwoPointConicalGradient& shader, + SkShader::TileMode tm, const SkMatrix* localMatrix); }; #endif diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index e3d89960c6..3507c891c0 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -712,7 +712,7 @@ bool SkTwoPointRadialGradient::asNewEffect(GrContext* context, const SkPaint& pa bool SkTwoPointRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + GrEffect** grEffect) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } diff --git a/src/effects/gradients/SkTwoPointRadialGradient.h b/src/effects/gradients/SkTwoPointRadialGradient.h index 8916754062..dc3a1553a1 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.h +++ b/src/effects/gradients/SkTwoPointRadialGradient.h @@ -22,7 +22,7 @@ public: TileMode* xy) const SK_OVERRIDE; virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asNewEffect(GrContext* context, const SkPaint&, const SkMatrix*, GrColor*, - GrEffectRef**) const SK_OVERRIDE; + GrEffect**) const SK_OVERRIDE; virtual size_t contextSize() const SK_OVERRIDE; -- cgit v1.2.3