diff options
| author |  jvanverth <jvanverth@google.com> | 2015-04-15 12:31:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-15 12:31:22 -0700 |
| commit | 221360a514fb4bfff5b461e83262306b2a0f36af (patch) | |
| tree | a846ea9db18d86b00c4e662ad31c3f89dc327022 /src/gpu/effects/GrDistanceFieldGeoProc.h | |
| parent | ddb714b09a5f84e870dfc650b6da4197fd36d9c2 (diff) | |
Real fix for the Mali bug.
The dFdy(st.y) computation seems to be better than the dFdx(st.x) computation
on the Mali, so using that. The end result should be about the same.
BUG=skia:3528
Review URL: https://codereview.chromium.org/1082913006
Diffstat (limited to 'src/gpu/effects/GrDistanceFieldGeoProc.h')
| -rw-r--r-- | src/gpu/effects/GrDistanceFieldGeoProc.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h index aaa1b6339c..0ae0c0f711 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.h +++ b/src/gpu/effects/GrDistanceFieldGeoProc.h @@ -48,18 +48,16 @@ class GrDistanceFieldA8TextGeoProc : 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, float lum, uint32_t flags, bool opaqueVertexColors) { - return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, localMatrix, tex, + return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, tex, params, lum, flags, opaqueVertexColors)); } #else static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, - const SkMatrix& localMatrix, GrTexture* tex, const GrTextureParams& params, uint32_t flags, bool opaqueVertexColors) { - return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, localMatrix, tex, + return SkNEW_ARGS(GrDistanceFieldA8TextGeoProc, (color, viewMatrix, tex, params, flags, opaqueVertexColors)); } #endif @@ -90,7 +88,7 @@ public: const GrBatchTracker&) const override; private: - GrDistanceFieldA8TextGeoProc(GrColor, const SkMatrix& viewMatrix, const SkMatrix& localMatrix, + GrDistanceFieldA8TextGeoProc(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, const GrTextureParams& params, #ifdef SK_GAMMA_APPLY_TO_A8 float distanceAdjust, @@ -197,11 +195,10 @@ public: }; static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, - const SkMatrix& localMatrix, GrTexture* tex, const GrTextureParams& params, DistanceAdjust distanceAdjust, uint32_t flags) { return SkNEW_ARGS(GrDistanceFieldLCDTextGeoProc, - (color, viewMatrix, localMatrix, tex, params, distanceAdjust, flags)); + (color, viewMatrix, tex, params, distanceAdjust, flags)); } virtual ~GrDistanceFieldLCDTextGeoProc() {} @@ -228,7 +225,6 @@ public: private: GrDistanceFieldLCDTextGeoProc(GrColor, const SkMatrix& viewMatrix, - const SkMatrix& localMatrix, GrTexture* texture, const GrTextureParams& params, DistanceAdjust wa, uint32_t flags); |