Index: src/gpu/effects/GrDistanceFieldGeoProc.h |
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h |
index 362278f86376f84dc30d9be12f5043f8e195f49a..44f028366c1d017149558fb63e336931f0254e89 100644 |
--- a/src/gpu/effects/GrDistanceFieldGeoProc.h |
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.h |
@@ -49,16 +49,15 @@ public: |
#ifdef SK_GAMMA_APPLY_TO_A8 |
static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, |
GrTexture* tex, const GrTextureParams& params, |
- float lum, uint32_t flags, bool opaqueVertexColors) { |
- return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, tex, |
- params, lum, flags, opaqueVertexColors)); |
+ float lum, uint32_t flags) { |
+ return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, tex, params, lum, |
+ flags)); |
} |
#else |
static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, |
GrTexture* tex, const GrTextureParams& params, |
- uint32_t flags, bool opaqueVertexColors) { |
- return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, tex, |
- params, flags, opaqueVertexColors)); |
+ uint32_t flags) { |
+ return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, tex, params, flags)); |
} |
#endif |
@@ -83,21 +82,13 @@ public: |
void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; |
- bool onCanMakeEqual(const GrBatchTracker&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) const override; |
- |
private: |
GrDistanceFieldA8TextGeoProc(GrColor, const SkMatrix& viewMatrix, |
GrTexture* texture, const GrTextureParams& params, |
#ifdef SK_GAMMA_APPLY_TO_A8 |
float distanceAdjust, |
#endif |
- uint32_t flags, bool opaqueVertexColors); |
- |
- bool onIsEqual(const GrGeometryProcessor& other) const override; |
- |
- void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; |
+ uint32_t flags); |
GrTextureAccess fTextureAccess; |
#ifdef SK_GAMMA_APPLY_TO_A8 |
@@ -124,9 +115,8 @@ class GrDistanceFieldPathGeoProc : public GrGeometryProcessor { |
public: |
static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, GrTexture* tex, |
const GrTextureParams& params, |
- uint32_t flags, bool opaqueVertexColors) { |
- return SkNEW_ARGS(GrDistanceFieldPathGeoProc, (color, viewMatrix, tex, params, |
- flags, opaqueVertexColors)); |
+ uint32_t flags) { |
+ return SkNEW_ARGS(GrDistanceFieldPathGeoProc, (color, viewMatrix, tex, params, flags)); |
} |
virtual ~GrDistanceFieldPathGeoProc() {} |
@@ -147,18 +137,9 @@ public: |
void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; |
- bool onCanMakeEqual(const GrBatchTracker&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) const override; |
- |
private: |
GrDistanceFieldPathGeoProc(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, |
- const GrTextureParams& params, uint32_t flags, |
- bool opaqueVertexColors); |
- |
- bool onIsEqual(const GrGeometryProcessor& other) const override; |
- |
- void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; |
+ const GrTextureParams& params, uint32_t flags); |
GrTextureAccess fTextureAccess; |
uint32_t fFlags; |
@@ -219,19 +200,11 @@ public: |
void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; |
- bool onCanMakeEqual(const GrBatchTracker&, |
- const GrGeometryProcessor&, |
- const GrBatchTracker&) const override; |
- |
private: |
GrDistanceFieldLCDTextGeoProc(GrColor, const SkMatrix& viewMatrix, |
GrTexture* texture, const GrTextureParams& params, |
DistanceAdjust wa, uint32_t flags); |
- bool onIsEqual(const GrGeometryProcessor& other) const override; |
- |
- void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; |
- |
GrTextureAccess fTextureAccess; |
DistanceAdjust fDistanceAdjust; |
uint32_t fFlags; |