| Index: src/core/SkLocalMatrixShader.h
|
| diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
|
| index 1adfb0a730e62693e1cbb045c0080ed6f23558a9..1143f062d386689cf2a10ded238ad87f446420ce 100644
|
| --- a/src/core/SkLocalMatrixShader.h
|
| +++ b/src/core/SkLocalMatrixShader.h
|
| @@ -32,15 +32,27 @@ public:
|
| return fProxyShader->asAGradient(info);
|
| }
|
|
|
| - virtual GrEffectRef* asNewEffect(GrContext* ctx, const SkPaint& paint,
|
| - const SkMatrix* localMatrix) const SK_OVERRIDE {
|
| +#if SK_SUPPORT_GPU
|
| +
|
| + virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix,
|
| + GrColor* grColor, GrEffectRef** grEffect) const SK_OVERRIDE {
|
| SkMatrix tmp = fProxyLocalMatrix;
|
| if (localMatrix) {
|
| tmp.preConcat(*localMatrix);
|
| }
|
| - return fProxyShader->asNewEffect(ctx, paint, &tmp);
|
| + return fProxyShader->asNewEffect(context, paint, &tmp, grColor, grEffect);
|
| }
|
| -
|
| +
|
| +#else
|
| +
|
| + virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix,
|
| + GrColor* grColor, GrEffectRef** grEffect) const SK_OVERRIDE {
|
| + SkDEBUGFAIL("Should not call in GPU-less build");
|
| + return false;
|
| + }
|
| +
|
| +#endif
|
| +
|
| virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE {
|
| if (localMatrix) {
|
| *localMatrix = fProxyLocalMatrix;
|
|
|