| Index: src/gpu/effects/GrEllipseEdgeEffect.cpp
|
| ===================================================================
|
| --- src/gpu/effects/GrEllipseEdgeEffect.cpp (revision 8216)
|
| +++ src/gpu/effects/GrEllipseEdgeEffect.cpp (working copy)
|
| @@ -15,20 +15,20 @@
|
|
|
| class GrGLEllipseEdgeEffect : public GrGLEffect {
|
| public:
|
| - GrGLEllipseEdgeEffect(const GrBackendEffectFactory& factory, const GrEffectRef&)
|
| + GrGLEllipseEdgeEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
|
| : INHERITED (factory) {}
|
|
|
| virtual void emitCode(GrGLShaderBuilder* builder,
|
| - const GrEffectStage& stage,
|
| + const GrDrawEffect& drawEffect,
|
| EffectKey key,
|
| - const char* vertexCoords,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TextureSamplerArray& samplers) SK_OVERRIDE {
|
| const char *vsName, *fsName;
|
| builder->addVarying(kVec4f_GrSLType, "EllipseEdge", &vsName, &fsName);
|
|
|
| - const SkString* attrName = builder->getEffectAttributeName(stage.getVertexAttribIndices()[0]);
|
| + const SkString* attrName =
|
| + builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
|
| builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());
|
|
|
| builder->fsCodeAppend("\tfloat edgeAlpha;\n");
|
| @@ -44,11 +44,11 @@
|
| builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str());
|
| }
|
|
|
| - static inline EffectKey GenKey(const GrEffectStage& stage, const GrGLCaps&) {
|
| + static inline EffectKey GenKey(const GrDrawEffect&, const GrGLCaps&) {
|
| return 0;
|
| }
|
|
|
| - virtual void setData(const GrGLUniformManager& uman, const GrEffectStage& stage) SK_OVERRIDE {
|
| + virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {
|
| }
|
|
|
| private:
|
|
|