Index: src/gpu/GrAAConvexPathRenderer.cpp |
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp |
index c6da45e926d560ff407b5daf913f3f493bd6504d..6cb5b9e1df6ee1e03a350286385a09a29c9d105c 100644 |
--- a/src/gpu/GrAAConvexPathRenderer.cpp |
+++ b/src/gpu/GrAAConvexPathRenderer.cpp |
@@ -530,11 +530,11 @@ public: |
class GLEffect : public GrGLGeometryProcessor { |
public: |
- GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&) |
+ GLEffect(const GrBackendEffectFactory& factory, const GrEffect&) |
: INHERITED (factory) {} |
virtual void emitCode(GrGLFullProgramBuilder* builder, |
- const GrDrawEffect& drawEffect, |
+ const GrEffect& effect, |
const GrEffectKey& key, |
const char* outputColor, |
const char* inputColor, |
@@ -569,14 +569,15 @@ public: |
fsBuilder->codeAppendf("\t%s = %s;\n", outputColor, |
(GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str()); |
- const GrShaderVar& inQuadEdge = drawEffect.castEffect<QuadEdgeEffect>().inQuadEdge(); |
+ const GrShaderVar& inQuadEdge = |
+ GrEffect::CastEffect<QuadEdgeEffect>(effect).inQuadEdge(); |
GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); |
vsBuilder->codeAppendf("\t%s = %s;\n", vsName, inQuadEdge.c_str()); |
} |
- static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {} |
+ static inline void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {} |
- virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE {} |
+ virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE {} |
private: |
typedef GrGLGeometryProcessor INHERITED; |