| Index: src/effects/gradients/SkGradientShaderPriv.h
|
| diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
|
| index 31cc9f26171c6184b4535004ea1388d2de024bc4..ed9c5260782c6eb5a487cae6a3d7e0b7920193e8 100644
|
| --- a/src/effects/gradients/SkGradientShaderPriv.h
|
| +++ b/src/effects/gradients/SkGradientShaderPriv.h
|
| @@ -289,7 +289,7 @@ public:
|
| GrGLGradientEffect(const GrBackendEffectFactory& factory);
|
| virtual ~GrGLGradientEffect();
|
|
|
| - virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
|
| + virtual void setData(const GrGLContext&, const GrDrawEffect&) SK_OVERRIDE;
|
|
|
| protected:
|
| /**
|
| @@ -323,12 +323,13 @@ protected:
|
|
|
| // Emits the uniform used as the y-coord to texture samples in derived classes. Subclasses
|
| // should call this method from their emitCode().
|
| - void emitYCoordUniform(GrGLShaderBuilder* builder);
|
| + GrGLShaderBuilder::Uniform* emitYCoordUniform(GrGLShaderBuilder* builder);
|
|
|
| // emit code that gets a fragment's color from an expression for t; for now this always uses the
|
| // texture, but for simpler cases we'll be able to lerp. Subclasses should call this method from
|
| // their emitCode().
|
| void emitColorLookup(GrGLShaderBuilder* builder,
|
| + GrGLShaderBuilder::Uniform* fsYUni,
|
| const char* gradientTValue,
|
| const char* outputColor,
|
| const char* inputColor,
|
| @@ -338,7 +339,7 @@ private:
|
| static const GrEffect::CoordsType kCoordsType = GrEffect::kLocal_CoordsType;
|
|
|
| SkScalar fCachedYCoord;
|
| - GrGLUniformManager::UniformHandle fFSYUni;
|
| + GrGLUniform* fFSYUni;
|
| GrGLEffectMatrix fEffectMatrix;
|
|
|
| typedef GrGLEffect INHERITED;
|
|
|