diff options
| author |  reed <reed@google.com> | 2014-07-07 15:17:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-07 15:17:49 -0700 |
| commit | 969842ac9c3825100c86c8dae88d931c06286622 (patch) | |
| tree | 2b7c88691e02289791cf242c9195cdf6c6d25796 /include/effects | |
| parent | 2011fe9cdfa63b83489a146cea6a724cede352c8 (diff) | |
Revert of Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. (https://codereview.chromium.org/377503004/)
Reason for revert:
broke linux builders
Original issue's description:
> 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, bsalomon@google.com
TBR=bsalomon@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: reed@google.com
Review URL: https://codereview.chromium.org/372053003
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, 5 insertions, 6 deletions
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index edbe07dd77..5cfa46896b 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 GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE; + virtual GrEffectRef* asNewEffect(GrContext*) const SK_OVERRIDE; #endif struct State { diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index 06eb01a1ff..f2cee294c3 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 GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE; + virtual GrEffectRef* asNewEffect(GrContext*) const SK_OVERRIDE; #endif SK_TO_STRING_OVERRIDE() diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index b992e282b6..9d8a9b6cb0 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -28,8 +28,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(GrEffect** effect, GrTexture* texture, const SkMatrix& matrix, - const SkIRect& bounds) const SK_OVERRIDE; + virtual bool asNewEffect(GrEffectRef** 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 6d4c826038..606de570bd 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -86,7 +86,7 @@ protected: #if SK_SUPPORT_GPU - virtual bool asNewEffect(GrEffect** effect, + virtual bool asNewEffect(GrEffectRef** effect, GrTexture*, const SkMatrix& ctm, const SkIRect& bounds) const SK_OVERRIDE; diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 33559256e1..2d9dfdd69a 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*, - GrEffect**) const SK_OVERRIDE; + GrEffectRef**) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) |