diff options
author | 2018-04-11 15:33:40 -0400 | |
---|---|---|
committer | 2018-04-11 20:13:22 +0000 | |
commit | c6c5eade823a399efc1671c2c7f1bc278273d2d5 (patch) | |
tree | 6119d0ae93da1120e3d6077b4d8494458bfec365 /src/core/SkMaskFilter.cpp | |
parent | f70b22ec36177034b76d21b00c1f14ba72e99f0b (diff) |
Reland "Fix handling of MaskFilter matrices"
This reverts commit c64ee20e135a336ed775ccb6dec8a87efd19ec02.
Reason for revert: initial failures should be fixed in https://skia.googlesource.com/skia.git/+/8eaf64ae12696d4189d3cea9f023658494cf82b8
Original change's description:
> 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>
TBR=bsalomon@google.com,robertphillips@google.com,fmalita@chromium.org,reed@google.com
Change-Id: If194862a928d1abe22ed8fa968436c725d19a8fc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7744
Reviewed-on: https://skia-review.googlesource.com/120480
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkMaskFilter.cpp')
-rw-r--r-- | src/core/SkMaskFilter.cpp | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp index e1805637a9..7c90634e12 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp @@ -635,9 +635,9 @@ void SkCombineMF::toString(SkString* str) const { /////////////////////////////////////////////////////////////////////////////////////////////////// -class SkLocalMatrixMF : public SkMaskFilterBase { +class SkMatrixMF : public SkMaskFilterBase { public: - SkLocalMatrixMF(sk_sp<SkMaskFilter> filter, const SkMatrix& lm) + SkMatrixMF(sk_sp<SkMaskFilter> filter, const SkMatrix& lm) : fFilter(std::move(filter)) , fLM(lm) {} @@ -657,7 +657,7 @@ public: SkMask::Format getFormat() const override { return as_MFB(fFilter)->getFormat(); } void toString(SkString* str) const override { - str->set("SkLocalMatrixMF:"); + str->set("SkMatrixMF:"); } SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixMF) @@ -665,16 +665,7 @@ public: protected: #if SK_SUPPORT_GPU std::unique_ptr<GrFragmentProcessor> onAsFragmentProcessor(const GrFPArgs& args) const override{ - GrFPArgs newArgs = args; - - SkMatrix storage; - if (args.fLocalMatrix) { - storage.setConcat(*args.fLocalMatrix, fLM); - newArgs.fLocalMatrix = &storage; - } else { - newArgs.fLocalMatrix = &fLM; - } - return as_MFB(fFilter)->asFragmentProcessor(newArgs); + return as_MFB(fFilter)->asFragmentProcessor(GrFPArgs::WithPostLocalMatrix(args, fLM)); } bool onHasFragmentProcessor() const override { @@ -695,11 +686,11 @@ private: typedef SkMaskFilterBase INHERITED; }; -sk_sp<SkFlattenable> SkLocalMatrixMF::CreateProc(SkReadBuffer& buffer) { - SkMatrix lm; - buffer.readMatrix(&lm); +sk_sp<SkFlattenable> SkMatrixMF::CreateProc(SkReadBuffer& buffer) { + SkMatrix m; + buffer.readMatrix(&m); auto filter = buffer.readMaskFilter(); - return filter ? filter->makeWithLocalMatrix(lm) : nullptr; + return filter ? filter->makeWithMatrix(m) : nullptr; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -735,16 +726,16 @@ sk_sp<SkMaskFilter> SkMaskFilter::MakeCombine(sk_sp<SkMaskFilter> dst, sk_sp<SkM return sk_sp<SkMaskFilter>(new SkCombineMF(std::move(dst), std::move(src), mode)); } -sk_sp<SkMaskFilter> SkMaskFilter::makeWithLocalMatrix(const SkMatrix& lm) const { +sk_sp<SkMaskFilter> SkMaskFilter::makeWithMatrix(const SkMatrix& lm) const { sk_sp<SkMaskFilter> me = sk_ref_sp(const_cast<SkMaskFilter*>(this)); if (lm.isIdentity()) { return me; } - return sk_sp<SkMaskFilter>(new SkLocalMatrixMF(std::move(me), lm)); + return sk_sp<SkMaskFilter>(new SkMatrixMF(std::move(me), lm)); } void SkMaskFilter::InitializeFlattenables() { - SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixMF) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixMF) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeMF) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCombineMF) sk_register_blur_maskfilter_createproc(); |