diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-10-03 17:15:28 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 21:39:33 +0000 |
| commit | 2ebd0c80a2a9d90a2c2c653f40a2a7205bd2d31b (patch) | |
| tree | 1baafac8edfb1d5d51e9ea53b176b95506e809cd /src/effects/SkDisplacementMapEffect.cpp | |
| parent | 2cbcd12281ee807214df094964c584c78932e10b (diff) | |
Remove option to make GrCoordTransforms apply to device positions.
Adds a device space texture decal effect to use for clipping.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2870
Change-Id: Ifcc7617ea87f5a86e301995cba9dfc30a4b0e2c5
Reviewed-on: https://skia-review.googlesource.com/2870
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 4f6386d92e..283372f9a9 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -480,10 +480,9 @@ GrDisplacementMapEffect::GrDisplacementMapEffect( const SkMatrix& offsetMatrix, GrTexture* color, const SkISize& colorDimensions) - : fDisplacementTransform(kLocal_GrCoordSet, offsetMatrix, displacement, - GrTextureParams::kNone_FilterMode) + : fDisplacementTransform(offsetMatrix, displacement, GrTextureParams::kNone_FilterMode) , fDisplacementAccess(displacement) - , fColorTransform(kLocal_GrCoordSet, color, GrTextureParams::kNone_FilterMode) + , fColorTransform(color, GrTextureParams::kNone_FilterMode) , fDomain(GrTextureDomain::MakeTexelDomain(color, SkIRect::MakeSize(colorDimensions)), GrTextureDomain::kDecal_Mode) , fColorAccess(color) |