| Index: src/gpu/effects/GrDistanceFieldGeoProc.h
|
| diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h
|
| index b0ebdb04f99e6e0215f9cc65dd38c558b8caacfb..ad8cf972f1bea59a48adb80659e5d3e02348c6ac 100644
|
| --- a/src/gpu/effects/GrDistanceFieldGeoProc.h
|
| +++ b/src/gpu/effects/GrDistanceFieldGeoProc.h
|
| @@ -79,12 +79,9 @@ public:
|
| #endif
|
| uint32_t getFlags() const { return fFlags; }
|
|
|
| - virtual void getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const override;
|
| + void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
|
|
|
| - virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLSLCaps&) const override;
|
| + GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override;
|
|
|
| private:
|
| GrDistanceFieldA8TextGeoProc(GrColor, const SkMatrix& viewMatrix,
|
| @@ -141,12 +138,9 @@ public:
|
| uint32_t getFlags() const { return fFlags; }
|
| bool usesLocalCoords() const { return fUsesLocalCoords; }
|
|
|
| - virtual void getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const override;
|
| + void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
|
|
|
| - virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLSLCaps&) const override;
|
| + GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override;
|
|
|
| private:
|
| GrDistanceFieldPathGeoProc(GrColor, const SkMatrix& viewMatrix, GrTexture* texture,
|
| @@ -211,12 +205,9 @@ public:
|
| uint32_t getFlags() const { return fFlags; }
|
| bool usesLocalCoords() const { return fUsesLocalCoords; }
|
|
|
| - virtual void getGLProcessorKey(const GrBatchTracker& bt,
|
| - const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const override;
|
| + void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
|
|
|
| - virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| - const GrGLSLCaps&) const override;
|
| + GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override;
|
|
|
| private:
|
| GrDistanceFieldLCDTextGeoProc(GrColor, const SkMatrix& viewMatrix,
|
|
|