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/core/SkXfermode.h | |
| 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/core/SkXfermode.h')
| -rw-r--r-- | include/core/SkXfermode.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h index c0a6572ec7..74fd9f85f7 100644 --- a/include/core/SkXfermode.h +++ b/include/core/SkXfermode.h @@ -13,7 +13,7 @@ #include "SkFlattenable.h" #include "SkColor.h" -class GrEffectRef; +class GrEffect; class GrTexture; class SkString; @@ -198,7 +198,7 @@ public: fragment shader. If NULL, the effect should request access to destination color (setWillReadDstColor()), and use that in the fragment shader (builder->dstColor()). */ - virtual bool asNewEffect(GrEffectRef** effect, GrTexture* background = NULL) const; + virtual bool asNewEffect(GrEffect** effect, GrTexture* background = NULL) const; /** Returns true if the xfermode can be expressed as coeffs (src, dst), or as an effect (effect). This helper calls the asCoeff() and asNewEffect() virtuals. If the xfermode is @@ -206,7 +206,7 @@ public: simply test the return value. effect, src, and dst must all be NULL or all non-NULL. */ static bool AsNewEffectOrCoeff(SkXfermode*, - GrEffectRef** effect, + GrEffect** effect, Coeff* src, Coeff* dst, GrTexture* background = NULL); |