diff options
| author |  bsalomon <bsalomon@google.com> | 2014-07-07 15:11:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-07 15:11:31 -0700 |
| commit | 2011fe9cdfa63b83489a146cea6a724cede352c8 (patch) | |
| tree | 200081e467bb69640fc811733b35d6559403b938 /src/effects/SkPerlinNoiseShader.cpp | |
| parent | 24dcac2140a7cca111c7f1bd44b44541644887a3 (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.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/377503004
Diffstat (limited to 'src/effects/SkPerlinNoiseShader.cpp')
| -rw-r--r-- | src/effects/SkPerlinNoiseShader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |