diff options
author | Florin Malita <fmalita@chromium.org> | 2018-04-10 16:47:46 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-11 11:25:06 +0000 |
commit | 2097fd03ffea48bd904c48c93348b2350600870e (patch) | |
tree | 11fac8634429396ed18c59d1e73a8e5dde379de8 /src/gpu/SkGr.cpp | |
parent | a479f96dafa94549ed3b5b72d1d25bacd9d18b16 (diff) |
Fix handling of MaskFilter matrices
1) extend GrFPArgs to track pre/post local matrices, add helpers for
creating pre/post wrapper args
2) add a SkShaderBase helper (totalLocalMatrix) to centralize the LM
sandwich logic.
3) update call sites to use the above
4) rename SkMatrixFilter::makeWithLocalMatrix -> makeWithMatrix, to
disambiguate vs. SkShader::makeWithLocalMatrix.
BUG=skia:7744
Change-Id: Ib2b7b007e6924979b00649dde7c94ef4b34771f1
Reviewed-on: https://skia-review.googlesource.com/119330
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/SkGr.cpp')
-rw-r--r-- | src/gpu/SkGr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index b4cb22bd10..99465f620b 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -514,7 +514,7 @@ bool SkPaintToGrPaintWithTexture(GrContext* context, if (textureIsAlphaOnly) { if (const auto* shader = as_SB(paint.getShader())) { shaderFP = shader->asFragmentProcessor(GrFPArgs( - context, &viewM, nullptr, paint.getFilterQuality(), &colorSpaceInfo)); + context, &viewM, paint.getFilterQuality(), &colorSpaceInfo)); if (!shaderFP) { return false; } |