diff options
author | Florin Malita <fmalita@chromium.org> | 2018-07-09 16:20:47 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-10 13:28:15 +0000 |
commit | 418e658a6922923f8d1e1ce2cf00f0a0f6b18ff3 (patch) | |
tree | 3454ad2c2d0a10f2561511ab977753a7cffcc40e /modules/sksg/include/SkSGMerge.h | |
parent | 6d98257725b59e01a1a844b1b9c9e80912512b49 (diff) |
[skottie] Apply fully opaque masks as clips
We already have a clip optimization when there is only one opaque mask.
Extend to cover multiple opaque masks, using Merge scene nodes.
TBR=
Change-Id: I24b61f0c0d080b13438c6777e98a8e2fefd09fdd
Reviewed-on: https://skia-review.googlesource.com/140002
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'modules/sksg/include/SkSGMerge.h')
-rw-r--r-- | modules/sksg/include/SkSGMerge.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/modules/sksg/include/SkSGMerge.h b/modules/sksg/include/SkSGMerge.h index 54924d6475..c4957f45a1 100644 --- a/modules/sksg/include/SkSGMerge.h +++ b/modules/sksg/include/SkSGMerge.h @@ -36,8 +36,13 @@ public: kXOR, }; - static sk_sp<Merge> Make(std::vector<sk_sp<GeometryNode>>&& geos, Mode mode) { - return sk_sp<Merge>(new Merge(std::move(geos), mode)); + struct Rec { + sk_sp<GeometryNode> fGeo; + Mode fMode; + }; + + static sk_sp<Merge> Make(std::vector<Rec>&& recs) { + return sk_sp<Merge>(new Merge(std::move(recs))); } ~Merge() override; @@ -50,11 +55,10 @@ protected: SkPath onAsPath() const override; private: - Merge(std::vector<sk_sp<GeometryNode>>&& geos, Mode); + Merge(std::vector<Rec>&& recs); - std::vector<sk_sp<GeometryNode>> fGeos; - SkPath fMerged; - Mode fMode; + const std::vector<Rec> fRecs; + SkPath fMerged; using INHERITED = GeometryNode; }; |