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/core/SkLocalMatrixShader.h | |
| 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/core/SkLocalMatrixShader.h')
| -rw-r--r-- | src/core/SkLocalMatrixShader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h index 1143f062d3..b56cd4726f 100644 --- a/src/core/SkLocalMatrixShader.h +++ b/src/core/SkLocalMatrixShader.h @@ -35,7 +35,7 @@ public: #if SK_SUPPORT_GPU virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, - GrColor* grColor, GrEffectRef** grEffect) const SK_OVERRIDE { + GrColor* grColor, GrEffect** grEffect) const SK_OVERRIDE { SkMatrix tmp = fProxyLocalMatrix; if (localMatrix) { tmp.preConcat(*localMatrix); @@ -46,7 +46,7 @@ public: #else virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix, - GrColor* grColor, GrEffectRef** grEffect) const SK_OVERRIDE { + GrColor* grColor, GrEffect** grEffect) const SK_OVERRIDE { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } |