diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-04-11 12:38:41 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-11 12:38:47 +0000 |
| commit | c64ee20e135a336ed775ccb6dec8a87efd19ec02 (patch) | |
| tree | 661c8d0d3ee64ff31b45548758e3c1dfe4abc81d /include/core/SkMaskFilter.h | |
| parent | 90f09e7853f506808b7dad5c50b60376887277a4 (diff) | |
Revert "Fix handling of MaskFilter matrices"
This reverts commit 2097fd03ffea48bd904c48c93348b2350600870e.
Reason for revert: This is breaking a lot of Windows bots (esp. on the shadermaskfilter_localmatrix)
Original change's description:
> 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>
TBR=bsalomon@google.com,robertphillips@google.com,fmalita@chromium.org,reed@google.com
Change-Id: I918dbb95bf00b3122e6699b84566ec82dbb5fc5c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7744
Reviewed-on: https://skia-review.googlesource.com/120340
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/core/SkMaskFilter.h')
| -rw-r--r-- | include/core/SkMaskFilter.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h index bd2a20b825..1ea774a027 100644 --- a/include/core/SkMaskFilter.h +++ b/include/core/SkMaskFilter.h @@ -50,14 +50,7 @@ public: static sk_sp<SkMaskFilter> MakeCombine(sk_sp<SkMaskFilter> filterA, sk_sp<SkMaskFilter> filterB, SkCoverageMode mode); - /** - * Construct a maskfilter with an additional transform. - * - * Note: unlike shader local matrices, this transform composes next to the CTM. - * - * TotalMatrix = CTM x MaskFilterMatrix x (optional/downstream) ShaderLocalMatrix - */ - sk_sp<SkMaskFilter> makeWithMatrix(const SkMatrix&) const; + sk_sp<SkMaskFilter> makeWithLocalMatrix(const SkMatrix&) const; virtual void toString(SkString* str) const = 0; SK_DEFINE_FLATTENABLE_TYPE(SkMaskFilter) |