| Index: src/gpu/effects/GrBitmapTextGeoProc.h
|
| diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| index 7e74d67be1d73c8d2a8d0a7bff8e02058645edac..05f740fb57d1becd66688840e7ef82ddd7f9ca99 100644
|
| --- a/src/gpu/effects/GrBitmapTextGeoProc.h
|
| +++ b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| @@ -22,9 +22,10 @@
|
| class GrBitmapTextGeoProc : public GrGeometryProcessor {
|
| public:
|
| static GrGeometryProcessor* Create(GrColor color, GrTexture* tex, const GrTextureParams& p,
|
| - GrMaskFormat format,
|
| + GrMaskFormat format, bool opaqueVertexColors,
|
| const SkMatrix& localMatrix) {
|
| - return SkNEW_ARGS(GrBitmapTextGeoProc, (color, tex, p, format, localMatrix));
|
| + return SkNEW_ARGS(GrBitmapTextGeoProc, (color, tex, p, format, opaqueVertexColors,
|
| + localMatrix));
|
| }
|
|
|
| virtual ~GrBitmapTextGeoProc() {}
|
| @@ -44,10 +45,19 @@
|
| const GrGLCaps& 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, const SkMatrix& localMatrix);
|
| + GrMaskFormat format, bool opaqueVertexColors, const SkMatrix& localMatrix);
|
| +
|
| + bool onIsEqual(const GrGeometryProcessor& other) const override;
|
| +
|
| + void onGetInvariantOutputColor(GrInitInvariantOutput*) const override;
|
| +
|
| + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override;
|
|
|
| GrTextureAccess fTextureAccess;
|
| const Attribute* fInPosition;
|
|
|