| Index: src/gpu/GrDefaultGeoProcFactory.cpp
|
| diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
|
| index ddaa809f067bbcd07fcd14fe7362f80a43583638..ab28a579e7ab7a2115f53b1079fbd5a651dd0cd7 100644
|
| --- a/src/gpu/GrDefaultGeoProcFactory.cpp
|
| +++ b/src/gpu/GrDefaultGeoProcFactory.cpp
|
| @@ -75,9 +75,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 {
|
| @@ -111,17 +109,12 @@
|
| fs->codeAppendf("%s = vec4(alpha);", args.fOutputCoverage);
|
| }
|
|
|
| - static inline void GenKey(const GrGeometryProcessor& gp,
|
| - const GrBatchTracker&,
|
| - const GrGLCaps&,
|
| - GrProcessorKeyBuilder* b) {
|
| + static inline void GenKey(const GrProcessor& gp, const GrGLCaps&, GrProcessorKeyBuilder* b) {
|
| const DefaultGeoProc& def = gp.cast<DefaultGeoProc>();
|
| b->add32(def.fFlags);
|
| }
|
|
|
| - virtual void setData(const GrGLProgramDataManager&,
|
| - const GrGeometryProcessor&,
|
| - const GrBatchTracker&) SK_OVERRIDE {}
|
| + virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE {}
|
|
|
| private:
|
| typedef GrGLGeometryProcessor INHERITED;
|
|
|