diff options
author | 2014-09-16 07:17:28 -0700 | |
---|---|---|
committer | 2014-09-16 07:17:28 -0700 | |
commit | 08da4f22d790cfc51bbeb10b4b84dab49cf0eaec (patch) | |
tree | eb2c5cc2e59b708065484e18c01f459f6ef59ee9 /src/gpu/GrAAConvexPathRenderer.cpp | |
parent | 8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e (diff) |
Revert of removing GrDrawEffect (patchset #4 id:60001 of https://codereview.chromium.org/571163002/)
Reason for revert:
reverting to unblock another revert
Original issue's description:
> removing GrDrawEffect
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e
R=bsalomon@google.com
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/577593003
Diffstat (limited to 'src/gpu/GrAAConvexPathRenderer.cpp')
-rw-r--r-- | src/gpu/GrAAConvexPathRenderer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp index a479310c5d..c6da45e926 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 GrEffect&) + GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&) : INHERITED (factory) {} virtual void emitCode(GrGLFullProgramBuilder* builder, - const GrEffect& effect, + const GrDrawEffect& drawEffect, const GrEffectKey& key, const char* outputColor, const char* inputColor, @@ -569,14 +569,14 @@ public: fsBuilder->codeAppendf("\t%s = %s;\n", outputColor, (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str()); - const GrShaderVar& inQuadEdge = effect.cast<QuadEdgeEffect>().inQuadEdge(); + const GrShaderVar& inQuadEdge = drawEffect.castEffect<QuadEdgeEffect>().inQuadEdge(); GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); vsBuilder->codeAppendf("\t%s = %s;\n", vsName, inQuadEdge.c_str()); } - static inline void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {} + static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {} - virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE {} + virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&) SK_OVERRIDE {} private: typedef GrGLGeometryProcessor INHERITED; |