| Index: include/gpu/GrPaint.h
|
| diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
|
| index 900ab4c407b878c1a7e227188ed7eb396597b363..07b526f73cf7ed44b591c4766069471596583629 100644
|
| --- a/include/gpu/GrPaint.h
|
| +++ b/include/gpu/GrPaint.h
|
| @@ -87,24 +87,26 @@ public:
|
| /**
|
| * Appends an additional color effect to the color computation.
|
| */
|
| - const GrEffect* addColorEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
|
| + const GrEffect* addColorEffect(const GrEffect* effect) {
|
| SkASSERT(effect);
|
| + SkASSERT(!effect->requiresVertexShader());
|
| if (!effect->willUseInputColor()) {
|
| fColorStages.reset();
|
| }
|
| - SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect, attr0, attr1));
|
| + SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect));
|
| return effect;
|
| }
|
|
|
| /**
|
| * Appends an additional coverage effect to the coverage computation.
|
| */
|
| - const GrEffect* addCoverageEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
|
| + const GrEffect* addCoverageEffect(const GrEffect* effect) {
|
| SkASSERT(effect);
|
| + SkASSERT(!effect->requiresVertexShader());
|
| if (!effect->willUseInputColor()) {
|
| fCoverageStages.reset();
|
| }
|
| - SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect, attr0, attr1));
|
| + SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect));
|
| return effect;
|
| }
|
|
|
|
|