Index: src/gpu/effects/GrDistanceFieldTextureEffect.h |
diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h |
index 58d1b77a5943a30340f9dd2b607835bca400191d..6be7f9eef36a86fa93385aa4c7f4e772bba1288a 100644 |
--- a/src/gpu/effects/GrDistanceFieldTextureEffect.h |
+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h |
@@ -47,20 +47,18 @@ |
class GrDistanceFieldTextureEffect : public GrGeometryProcessor { |
public: |
#ifdef SK_GAMMA_APPLY_TO_A8 |
- static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, |
- const SkMatrix& localMatrix, |
- GrTexture* tex, const GrTextureParams& params, |
+ static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, GrTexture* tex, |
+ const GrTextureParams& params, |
float lum, uint32_t flags, bool opaqueVertexColors) { |
- return SkNEW_ARGS(GrDistanceFieldTextureEffect, (color, viewMatrix, localMatrix, tex, |
- params, lum, flags, opaqueVertexColors)); |
+ return SkNEW_ARGS(GrDistanceFieldTextureEffect, (color, viewMatrix, tex, params, lum, |
+ flags, opaqueVertexColors)); |
} |
#else |
- static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, |
- const SkMatrix& localMatrix, |
- GrTexture* tex, const GrTextureParams& params, |
+ static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, GrTexture* tex, |
+ const GrTextureParams& params, |
uint32_t flags, bool opaqueVertexColors) { |
- return SkNEW_ARGS(GrDistanceFieldTextureEffect, (color, viewMatrix, localMatrix, tex, |
- params, flags, opaqueVertexColors)); |
+ return SkNEW_ARGS(GrDistanceFieldTextureEffect, (color, viewMatrix, tex, params, flags, |
+ opaqueVertexColors)); |
} |
#endif |
@@ -90,8 +88,8 @@ |
const GrBatchTracker&) const override; |
private: |
- GrDistanceFieldTextureEffect(GrColor, const SkMatrix& viewMatrix, const SkMatrix& localMatrix, |
- GrTexture* texture, const GrTextureParams& params, |
+ GrDistanceFieldTextureEffect(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, |
+ const GrTextureParams& params, |
#ifdef SK_GAMMA_APPLY_TO_A8 |
float distanceAdjust, |
#endif |
@@ -196,12 +194,11 @@ |
} |
}; |
- static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, |
- const SkMatrix& localMatrix, |
- GrTexture* tex, const GrTextureParams& params, |
+ static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, GrTexture* tex, |
+ const GrTextureParams& params, |
DistanceAdjust distanceAdjust, uint32_t flags) { |
return SkNEW_ARGS(GrDistanceFieldLCDTextureEffect, |
- (color, viewMatrix, localMatrix, tex, params, distanceAdjust, flags)); |
+ (color, viewMatrix, tex, params, distanceAdjust, flags)); |
} |
virtual ~GrDistanceFieldLCDTextureEffect() {} |
@@ -227,9 +224,8 @@ |
const GrBatchTracker&) const override; |
private: |
- GrDistanceFieldLCDTextureEffect(GrColor, const SkMatrix& viewMatrix, |
- const SkMatrix& localMatrix, |
- GrTexture* texture, const GrTextureParams& params, |
+ GrDistanceFieldLCDTextureEffect(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, |
+ const GrTextureParams& params, |
DistanceAdjust wa, uint32_t flags); |
bool onIsEqual(const GrGeometryProcessor& other) const override; |