diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkXfermode.cpp | 8 | ||||
| -rw-r--r-- | src/core/SkXfermode_proccoeff.h | 3 | ||||
| -rw-r--r-- | src/effects/SkArithmeticMode.cpp | 5 | ||||
| -rw-r--r-- | src/effects/SkXfermodeImageFilter.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 2 |
5 files changed, 8 insertions, 12 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 6cdd97bb4c..75c652912b 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -673,12 +673,11 @@ bool SkXfermode::asMode(Mode* mode) const { return false; } -bool SkXfermode::asNewEffectOrCoeff(GrContext*, GrEffectRef**, Coeff* src, Coeff* dst, GrTexture*) const { +bool SkXfermode::asNewEffectOrCoeff(GrEffectRef**, Coeff* src, Coeff* dst, GrTexture*) const { return this->asCoeff(src, dst); } bool SkXfermode::AsNewEffectOrCoeff(SkXfermode* xfermode, - GrContext* context, GrEffectRef** effect, Coeff* src, Coeff* dst, @@ -686,7 +685,7 @@ bool SkXfermode::AsNewEffectOrCoeff(SkXfermode* xfermode, if (NULL == xfermode) { return ModeAsCoeff(kSrcOver_Mode, src, dst); } else { - return xfermode->asNewEffectOrCoeff(context, effect, src, dst, background); + return xfermode->asNewEffectOrCoeff(effect, src, dst, background); } } @@ -1364,8 +1363,7 @@ bool SkProcCoeffXfermode::asCoeff(Coeff* sc, Coeff* dc) const { } #if SK_SUPPORT_GPU -bool SkProcCoeffXfermode::asNewEffectOrCoeff(GrContext*, - GrEffectRef** effect, +bool SkProcCoeffXfermode::asNewEffectOrCoeff(GrEffectRef** effect, Coeff* src, Coeff* dst, GrTexture* background) const { diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h index 23a83f2c0d..bba8b39615 100644 --- a/src/core/SkXfermode_proccoeff.h +++ b/src/core/SkXfermode_proccoeff.h @@ -29,8 +29,7 @@ public: virtual bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool asNewEffectOrCoeff(GrContext*, - GrEffectRef** effect, + virtual bool asNewEffectOrCoeff(GrEffectRef** effect, Coeff* src, Coeff* dst, GrTexture* background) const SK_OVERRIDE; diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp index fff03c291f..7c4428c8ad 100644 --- a/src/effects/SkArithmeticMode.cpp +++ b/src/effects/SkArithmeticMode.cpp @@ -36,7 +36,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArithmeticMode_scalar) #if SK_SUPPORT_GPU - virtual bool asNewEffectOrCoeff(GrContext*, GrEffectRef** effect, Coeff*, Coeff*, GrTexture* background) const SK_OVERRIDE; + virtual bool asNewEffectOrCoeff(GrEffectRef** effect, Coeff*, Coeff*, GrTexture* background) const SK_OVERRIDE; #endif private: @@ -408,8 +408,7 @@ GrEffectRef* GrArithmeticEffect::TestCreate(SkRandom* rand, GR_DEFINE_EFFECT_TEST(GrArithmeticEffect); -bool SkArithmeticMode_scalar::asNewEffectOrCoeff(GrContext*, - GrEffectRef** effect, +bool SkArithmeticMode_scalar::asNewEffectOrCoeff(GrEffectRef** effect, Coeff*, Coeff*, GrTexture* background) const { diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp index 4d30f0031f..e8fa0d2787 100644 --- a/src/effects/SkXfermodeImageFilter.cpp +++ b/src/effects/SkXfermodeImageFilter.cpp @@ -123,7 +123,7 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy, GrContext::AutoRenderTarget art(context, dst->asRenderTarget()); SkXfermode::Coeff sm, dm; - if (!SkXfermode::AsNewEffectOrCoeff(fMode, context, &xferEffect, &sm, &dm, backgroundTex)) { + if (!SkXfermode::AsNewEffectOrCoeff(fMode, &xferEffect, &sm, &dm, backgroundTex)) { return false; } diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index a70a0f5f5c..47ddd521cb 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -436,7 +436,7 @@ inline bool skPaint2GrPaintNoShader(SkGpuDevice* dev, SkXfermode* mode = skPaint.getXfermode(); GrEffectRef* xferEffect = NULL; - if (SkXfermode::AsNewEffectOrCoeff(mode, dev->context(), &xferEffect, &sm, &dm)) { + if (SkXfermode::AsNewEffectOrCoeff(mode, &xferEffect, &sm, &dm)) { if (NULL != xferEffect) { grPaint->addColorEffect(xferEffect)->unref(); sm = SkXfermode::kOne_Coeff; |