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 /include/effects | |
| 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 'include/effects')
| -rw-r--r-- | include/effects/SkColorMatrixFilter.h | 2 | ||||
| -rw-r--r-- | include/effects/SkLumaColorFilter.h | 2 | ||||
| -rw-r--r-- | include/effects/SkMagnifierImageFilter.h | 3 | ||||
| -rw-r--r-- | include/effects/SkMatrixConvolutionImageFilter.h | 2 | ||||
| -rw-r--r-- | include/effects/SkPerlinNoiseShader.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 5cfa46896b..edbe07dd77 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -26,7 +26,7 @@ public: virtual uint32_t getFlags() const SK_OVERRIDE; virtual bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrEffectRef* asNewEffect(GrContext*) const SK_OVERRIDE; + virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE; #endif struct State { diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index f2cee294c3..06eb01a1ff 100644 --- a/include/effects/SkLumaColorFilter.h +++ b/include/effects/SkLumaColorFilter.h @@ -28,7 +28,7 @@ public: virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrEffectRef* asNewEffect(GrContext*) const SK_OVERRIDE; + virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE; #endif SK_TO_STRING_OVERRIDE() diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 9d8a9b6cb0..b992e282b6 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -28,7 +28,8 @@ 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, const SkMatrix& matrix, const SkIRect& bounds) const SK_OVERRIDE; + virtual bool asNewEffect(GrEffect** effect, GrTexture* texture, const SkMatrix& matrix, + const SkIRect& bounds) const SK_OVERRIDE; #endif private: diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index 606de570bd..6d4c826038 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -86,7 +86,7 @@ protected: #if SK_SUPPORT_GPU - virtual bool asNewEffect(GrEffectRef** effect, + virtual bool asNewEffect(GrEffect** effect, GrTexture*, const SkMatrix& ctm, const SkIRect& bounds) const SK_OVERRIDE; diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 2d9dfdd69a..33559256e1 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -97,7 +97,7 @@ public: }; virtual bool asNewEffect(GrContext* context, const SkPaint&, const SkMatrix*, GrColor*, - GrEffectRef**) const SK_OVERRIDE; + GrEffect**) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) |