commit b3a6959408e177bc38b96cb29cfac692f876e100
author Chris Dalton <csmartdalton@google.com> Wed Apr 18 14:10:22 2018 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 19 20:15:24 2018 +0000
tree 2045143c9070cf7c6e9248d95899b4deef96c9e9
parent e68c4fbf601e38fdab1e0ab4093647d5538fff11

ccpr: Clean up GrCCGeometry

Gets rid of the ugly template functions, rearranges a few static
methods, and adds a benchmark.

Bug: skia:
Change-Id: I442f3a581ba7faf7601ae5be0c7e07327df09496
Reviewed-on: https://skia-review.googlesource.com/122128
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/ccpr/GrCCGeometry.h

diff --git a/src/gpu/ccpr/GrCCGeometry.h b/src/gpu/ccpr/GrCCGeometry.h
index 7f098f9..96a38e9 100644
--- a/src/gpu/ccpr/GrCCGeometry.h
+++ b/src/gpu/ccpr/GrCCGeometry.h
@@ -99,27 +99,21 @@
 private:
     inline void appendLine(const Sk2f& endpt);
 
-    inline void appendMonotonicQuadratics(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2);
-    inline void appendSingleMonotonicQuadratic(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2);
+    inline void appendQuadratics(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2);
+    inline void appendMonotonicQuadratic(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2);
 
-    using AppendCubicFn = void(GrCCGeometry::*)(const Sk2f& p0, const Sk2f& p1,
-                                                const Sk2f& p2, const Sk2f& p3,
-                                                int maxSubdivisions);
-    static constexpr int kMaxSubdivionsPerCubicSection = 2;
-
-    template<AppendCubicFn AppendLeftRight>
-    inline void chopCubicAtMidTangent(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2,
-                                      const Sk2f& p3, const Sk2f& tan0, const Sk2f& tan3,
-                                      int maxFutureSubdivisions = kMaxSubdivionsPerCubicSection);
-
-    template<AppendCubicFn AppendLeft, AppendCubicFn AppendRight>
-    inline void chopCubic(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2, const Sk2f& p3,
-                          float T, int maxFutureSubdivisions = kMaxSubdivionsPerCubicSection);
-
-    void appendMonotonicCubics(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2, const Sk2f& p3,
-                               int maxSubdivisions = kMaxSubdivionsPerCubicSection);
-    void appendCubicApproximation(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2, const Sk2f& p3,
-                                  int maxSubdivisions = kMaxSubdivionsPerCubicSection);
+    enum class AppendCubicMode : bool {
+        kLiteral,
+        kApproximate
+    };
+    void appendCubics(AppendCubicMode, const Sk2f& p0, const Sk2f& p1, const Sk2f& p2,
+                      const Sk2f& p3, const float chops[], int numChops, float localT0 = 0,
+                     float localT1 = 1);
+    void appendCubics(AppendCubicMode, const Sk2f& p0, const Sk2f& p1, const Sk2f& p2,
+                      const Sk2f& p3, int maxSubdivisions = 2);
+    void chopAndAppendCubicAtMidTangent(AppendCubicMode, const Sk2f& p0, const Sk2f& p1,
+                                        const Sk2f& p2, const Sk2f& p3, const Sk2f& tan0,
+                                        const Sk2f& tan1, int maxFutureSubdivisions);
 
     void appendMonotonicConic(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2, float w);