Index: src/gpu/GrOvalRenderer.cpp |
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp |
index c6586120a9a902b02dfc4cbc0c0a69c618da690a..a9dda840aa59d2b036413597d76c4f6e13c9a295 100644 |
--- a/src/gpu/GrOvalRenderer.cpp |
+++ b/src/gpu/GrOvalRenderer.cpp |
@@ -91,9 +91,7 @@ |
class GLProcessor : public GrGLGeometryProcessor { |
public: |
- GLProcessor(const GrBackendProcessorFactory& factory, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) |
+ GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&) |
: INHERITED (factory) {} |
virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { |
@@ -124,17 +122,13 @@ |
fsBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage); |
} |
- static void GenKey(const GrGeometryProcessor& processor, |
- const GrBatchTracker&, |
- const GrGLCaps&, |
+ static void GenKey(const GrProcessor& processor, const GrGLCaps&, |
GrProcessorKeyBuilder* b) { |
const CircleEdgeEffect& circleEffect = processor.cast<CircleEdgeEffect>(); |
b->add32(circleEffect.isStroked()); |
} |
- virtual void setData(const GrGLProgramDataManager&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) SK_OVERRIDE {} |
+ virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE {} |
private: |
typedef GrGLGeometryProcessor INHERITED; |
@@ -218,9 +212,7 @@ |
class GLProcessor : public GrGLGeometryProcessor { |
public: |
- GLProcessor(const GrBackendProcessorFactory& factory, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) |
+ GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&) |
: INHERITED (factory) {} |
virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { |
@@ -273,17 +265,13 @@ |
fsBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage); |
} |
- static void GenKey(const GrGeometryProcessor& processor, |
- const GrBatchTracker&, |
- const GrGLCaps&, |
+ static void GenKey(const GrProcessor& processor, const GrGLCaps&, |
GrProcessorKeyBuilder* b) { |
const EllipseEdgeEffect& ellipseEffect = processor.cast<EllipseEdgeEffect>(); |
b->add32(ellipseEffect.isStroked()); |
} |
- virtual void setData(const GrGLProgramDataManager&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) SK_OVERRIDE { |
+ virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE { |
} |
private: |
@@ -376,9 +364,7 @@ |
class GLProcessor : public GrGLGeometryProcessor { |
public: |
- GLProcessor(const GrBackendProcessorFactory& factory, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) |
+ GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&) |
: INHERITED (factory) {} |
virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { |
@@ -445,18 +431,14 @@ |
fsBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage); |
} |
- static void GenKey(const GrGeometryProcessor& processor, |
- const GrBatchTracker&, |
- const GrGLCaps&, |
+ static void GenKey(const GrProcessor& processor, const GrGLCaps&, |
GrProcessorKeyBuilder* b) { |
const DIEllipseEdgeEffect& ellipseEffect = processor.cast<DIEllipseEdgeEffect>(); |
b->add32(ellipseEffect.getMode()); |
} |
- virtual void setData(const GrGLProgramDataManager&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) SK_OVERRIDE { |
+ virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE { |
} |
private: |