diff options
author | 2014-07-07 15:17:49 -0700 | |
---|---|---|
committer | 2014-07-07 15:17:49 -0700 | |
commit | 969842ac9c3825100c86c8dae88d931c06286622 (patch) | |
tree | 2b7c88691e02289791cf242c9195cdf6c6d25796 /src/core/SkLocalMatrixShader.h | |
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 '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 b56cd4726f..1143f062d3 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, GrEffect** grEffect) const SK_OVERRIDE { + GrColor* grColor, GrEffectRef** 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, GrEffect** grEffect) const SK_OVERRIDE { + GrColor* grColor, GrEffectRef** grEffect) const SK_OVERRIDE { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } |