diff options
Diffstat (limited to 'src/gpu/GrAAConvexPathRenderer.cpp')
-rw-r--r-- | src/gpu/GrAAConvexPathRenderer.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp index 78f2045786..ebb2f6988f 100644 --- a/src/gpu/GrAAConvexPathRenderer.cpp +++ b/src/gpu/GrAAConvexPathRenderer.cpp @@ -20,6 +20,7 @@ #include "gl/GrGLEffect.h" #include "gl/GrGLSL.h" +#include "gl/GrGLVertexEffect.h" #include "effects/GrVertexEffect.h" @@ -521,29 +522,26 @@ public: return GrTBackendEffectFactory<QuadEdgeEffect>::getInstance(); } - class GLEffect : public GrGLEffect { + class GLEffect : public GrGLVertexEffect { public: GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&) : INHERITED (factory) {} - virtual void emitCode(GrGLShaderBuilder* builder, + virtual void emitCode(GrGLFullShaderBuilder* builder, const GrDrawEffect& drawEffect, EffectKey key, const char* outputColor, const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray& samplers) SK_OVERRIDE { - GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertexBuilder(); - SkASSERT(NULL != vertexBuilder); - const char *vsName, *fsName; const SkString* attrName = - vertexBuilder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]); + builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]); builder->fsCodeAppendf("\t\tfloat edgeAlpha;\n"); SkAssertResult(builder->enableFeature( GrGLShaderBuilder::kStandardDerivatives_GLSLFeature)); - vertexBuilder->addVarying(kVec4f_GrSLType, "QuadEdge", &vsName, &fsName); + builder->addVarying(kVec4f_GrSLType, "QuadEdge", &vsName, &fsName); // keep the derivative instructions outside the conditional builder->fsCodeAppendf("\t\tvec2 duvdx = dFdx(%s.xy);\n", fsName); @@ -565,7 +563,7 @@ public: GrGLSLModulatef<4>(&modulate, inputColor, "edgeAlpha"); builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str()); - vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str()); + builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str()); } static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) { @@ -575,7 +573,7 @@ public: virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {} private: - typedef GrGLEffect INHERITED; + typedef GrGLVertexEffect INHERITED; }; private: |