| Index: src/gpu/effects/GrBitmapTextGeoProc.h
|
| diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| index 136fd321b35582aec6ccea18badd3c7c424190b6..d2d0422fc9d683ed0447f3e9e32c5a610b7861ab 100644
|
| --- a/src/gpu/effects/GrBitmapTextGeoProc.h
|
| +++ b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| @@ -22,10 +22,9 @@ class GrInvariantOutput;
|
| class GrBitmapTextGeoProc : public GrGeometryProcessor {
|
| public:
|
| static GrGeometryProcessor* Create(GrColor color, GrTexture* tex, const GrTextureParams& p,
|
| - GrMaskFormat format, bool opaqueVertexColors,
|
| + GrMaskFormat format,
|
| const SkMatrix& localMatrix) {
|
| - return SkNEW_ARGS(GrBitmapTextGeoProc, (color, tex, p, format, opaqueVertexColors,
|
| - localMatrix));
|
| + return SkNEW_ARGS(GrBitmapTextGeoProc, (color, tex, p, format, localMatrix));
|
| }
|
|
|
| virtual ~GrBitmapTextGeoProc() {}
|
| @@ -45,19 +44,10 @@ public:
|
| const GrGLSLCaps& caps) const override;
|
|
|
| void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override;
|
| - bool onCanMakeEqual(const GrBatchTracker&,
|
| - const GrGeometryProcessor&,
|
| - const GrBatchTracker&) const override;
|
|
|
| private:
|
| GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params,
|
| - GrMaskFormat format, bool opaqueVertexColors, const SkMatrix& localMatrix);
|
| -
|
| - bool onIsEqual(const GrGeometryProcessor& other) const override;
|
| -
|
| - void onGetInvariantOutputColor(GrInitInvariantOutput*) const override;
|
| -
|
| - void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override;
|
| + GrMaskFormat format, const SkMatrix& localMatrix);
|
|
|
| GrTextureAccess fTextureAccess;
|
| const Attribute* fInPosition;
|
|
|