Index: src/gpu/effects/GrDashingEffect.cpp |
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp |
index fec1551ef58196084934aafcb67701d1b36d9f57..95760e62e5ced5183bede3e97a8d1dfdb4affc7c 100644 |
--- a/src/gpu/effects/GrDashingEffect.cpp |
+++ b/src/gpu/effects/GrDashingEffect.cpp |
@@ -504,20 +504,13 @@ |
class GLDashingCircleEffect : public GrGLGeometryProcessor { |
public: |
- GLDashingCircleEffect(const GrBackendProcessorFactory&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&); |
+ GLDashingCircleEffect(const GrBackendProcessorFactory&, const GrProcessor&); |
virtual void emitCode(const EmitArgs&) SK_OVERRIDE; |
- static inline void GenKey(const GrGeometryProcessor&, |
- const GrBatchTracker&, |
- const GrGLCaps&, |
- GrProcessorKeyBuilder*); |
- |
- virtual void setData(const GrGLProgramDataManager&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) SK_OVERRIDE; |
+ static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); |
+ |
+ virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; |
private: |
GrGLProgramDataManager::UniformHandle fParamUniform; |
@@ -528,8 +521,7 @@ |
}; |
GLDashingCircleEffect::GLDashingCircleEffect(const GrBackendProcessorFactory& factory, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) |
+ const GrProcessor&) |
: INHERITED (factory) { |
fPrevRadius = SK_ScalarMin; |
fPrevCenterX = SK_ScalarMin; |
@@ -578,9 +570,8 @@ |
fsBuilder->codeAppendf("%s = vec4(alpha);", args.fOutputCoverage); |
} |
-void GLDashingCircleEffect::setData(const GrGLProgramDataManager& pdman, |
- const GrGeometryProcessor& processor, |
- const GrBatchTracker&) { |
+void GLDashingCircleEffect::setData(const GrGLProgramDataManager& pdman |
+ , const GrProcessor& processor) { |
const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>(); |
SkScalar radius = dce.getRadius(); |
SkScalar centerX = dce.getCenterX(); |
@@ -593,9 +584,7 @@ |
} |
} |
-void GLDashingCircleEffect::GenKey(const GrGeometryProcessor& processor, |
- const GrBatchTracker&, |
- const GrGLCaps&, |
+void GLDashingCircleEffect::GenKey(const GrProcessor& processor, const GrGLCaps&, |
GrProcessorKeyBuilder* b) { |
const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>(); |
b->add32(dce.getEdgeType()); |
@@ -723,20 +712,13 @@ |
class GLDashingLineEffect : public GrGLGeometryProcessor { |
public: |
- GLDashingLineEffect(const GrBackendProcessorFactory&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&); |
+ GLDashingLineEffect(const GrBackendProcessorFactory&, const GrProcessor&); |
virtual void emitCode(const EmitArgs&) SK_OVERRIDE; |
- static inline void GenKey(const GrGeometryProcessor&, |
- const GrBatchTracker&, |
- const GrGLCaps&, |
- GrProcessorKeyBuilder*); |
- |
- virtual void setData(const GrGLProgramDataManager&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) SK_OVERRIDE; |
+ static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); |
+ |
+ virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; |
private: |
GrGLProgramDataManager::UniformHandle fRectUniform; |
@@ -747,8 +729,7 @@ |
}; |
GLDashingLineEffect::GLDashingLineEffect(const GrBackendProcessorFactory& factory, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) |
+ const GrProcessor&) |
: INHERITED (factory) { |
fPrevRect.fLeft = SK_ScalarNaN; |
fPrevIntervalLength = SK_ScalarMax; |
@@ -811,8 +792,7 @@ |
} |
void GLDashingLineEffect::setData(const GrGLProgramDataManager& pdman, |
- const GrGeometryProcessor& processor, |
- const GrBatchTracker&) { |
+ const GrProcessor& processor) { |
const DashingLineEffect& de = processor.cast<DashingLineEffect>(); |
const SkRect& rect = de.getRect(); |
SkScalar intervalLength = de.getIntervalLength(); |
@@ -825,9 +805,7 @@ |
} |
} |
-void GLDashingLineEffect::GenKey(const GrGeometryProcessor& processor, |
- const GrBatchTracker&, |
- const GrGLCaps&, |
+void GLDashingLineEffect::GenKey(const GrProcessor& processor, const GrGLCaps&, |
GrProcessorKeyBuilder* b) { |
const DashingLineEffect& de = processor.cast<DashingLineEffect>(); |
b->add32(de.getEdgeType()); |