| Index: src/effects/gradients/SkLinearGradient.cpp
|
| ===================================================================
|
| --- src/effects/gradients/SkLinearGradient.cpp (revision 8241)
|
| +++ src/effects/gradients/SkLinearGradient.cpp (working copy)
|
| @@ -453,21 +453,20 @@
|
| class GrGLLinearGradient : public GrGLGradientEffect {
|
| public:
|
|
|
| - GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrEffectRef&)
|
| + GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrDrawEffect&)
|
| : INHERITED (factory) { }
|
|
|
| virtual ~GrGLLinearGradient() { }
|
|
|
| virtual void emitCode(GrGLShaderBuilder*,
|
| - const GrEffectStage&,
|
| + const GrDrawEffect&,
|
| EffectKey,
|
| - const char* vertexCoords,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TextureSamplerArray&) SK_OVERRIDE;
|
|
|
| - static EffectKey GenKey(const GrEffectStage& stage, const GrGLCaps&) {
|
| - return GenMatrixKey(stage);
|
| + static EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) {
|
| + return GenMatrixKey(drawEffect);
|
| }
|
|
|
| private:
|
| @@ -533,15 +532,14 @@
|
| /////////////////////////////////////////////////////////////////////
|
|
|
| void GrGLLinearGradient::emitCode(GrGLShaderBuilder* builder,
|
| - const GrEffectStage& stage,
|
| + const GrDrawEffect&,
|
| EffectKey key,
|
| - const char* vertexCoords,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TextureSamplerArray& samplers) {
|
| this->emitYCoordUniform(builder);
|
| const char* coords;
|
| - this->setupMatrix(builder, key, vertexCoords, &coords);
|
| + this->setupMatrix(builder, key, &coords);
|
| SkString t;
|
| t.append(coords);
|
| t.append(".x");
|
|
|