diff options
author | stephana <stephana@google.com> | 2016-10-04 09:56:08 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-04 09:56:08 -0700 |
commit | d36baa7a4a5ae3cc94cc4a45379f55658f80c0a6 (patch) | |
tree | d70c97848f983c8f8d6bac4e120784fbc47221c5 /src/core/SkScan.h | |
parent | 7795822807478143120c33228b68d2ab3918af2c (diff) |
Revert of Analytic AntiAlias for Convex Shapes (patchset #14 id:260001 of https://codereview.chromium.org/2221103002/ )
Reason for revert:
Breaks iOS build.
Original issue's description:
> Implement AnalyticAA for convex shapes.
>
> Design doc: go/analyticAA
>
> A performance test can be found here: https://docs.google.com/a/google.com/spreadsheets/d/1n9LSjFzrQzx0hovFddWey0GSMXNRjl1oFuSypMlHWZk/edit?usp=sharing
>
> Our best case is filling big triangles, which according to our experiment has ~2.9x speedup. Our worst case is filling small ovals/circles, which has a ~1.06x slowdown.
>
> To see how our new algorithm changes the DM images, see: https://x20web.corp.google.com/~liyuqian/dmdiff/index.html
> The most significant changes are in convexpaths and analytic_antialias_convex
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2221103002
>
> Committed: https://skia.googlesource.com/skia/+/7795822807478143120c33228b68d2ab3918af2c
TBR=reed@google.com,caryclark@google.com,liyuqian@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2388213003
Diffstat (limited to 'src/core/SkScan.h')
-rw-r--r-- | src/core/SkScan.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/core/SkScan.h b/src/core/SkScan.h index 1e3d60a290..4aa8e44399 100644 --- a/src/core/SkScan.h +++ b/src/core/SkScan.h @@ -22,24 +22,6 @@ class SkPath; */ typedef SkIRect SkXRect; -class GlobalAAConfig { -private: - GlobalAAConfig() {} - -public: - bool fUseAnalyticAA = false; - - GlobalAAConfig(const GlobalAAConfig&) = delete; - void operator=(const GlobalAAConfig&) = delete; - - static GlobalAAConfig& getInstance() { - static GlobalAAConfig instance; - return instance; - } -}; - -class AdditiveBlitter; - class SkScan { public: /* @@ -63,7 +45,6 @@ public: static void AntiFillXRect(const SkXRect&, const SkRasterClip&, SkBlitter*); static void FillPath(const SkPath&, const SkRasterClip&, SkBlitter*); static void AntiFillPath(const SkPath&, const SkRasterClip&, SkBlitter*); - static void AAAFillPath(const SkPath&, const SkRasterClip&, SkBlitter*); static void FrameRect(const SkRect&, const SkPoint& strokeSize, const SkRasterClip&, SkBlitter*); static void AntiFrameRect(const SkRect&, const SkPoint& strokeSize, @@ -98,9 +79,6 @@ private: const SkRegion*, SkBlitter*); static void HairLineRgn(const SkPoint[], int count, const SkRegion*, SkBlitter*); static void AntiHairLineRgn(const SkPoint[], int count, const SkRegion*, SkBlitter*); - static void AAAFillPath(const SkPath& path, const SkRegion& origClip, SkBlitter* blitter); - static void aaa_fill_path(const SkPath& path, const SkIRect* clipRect, AdditiveBlitter*, - int start_y, int stop_y, const SkRegion& clipRgn, bool isUsingMask); }; /** Assign an SkXRect from a SkIRect, by promoting the src rect's coordinates |