From 55011038816a3fc7f0c0a39d482fb85347cc2e78 Mon Sep 17 00:00:00 2001
From: reed <reed@google.com>
Date: Thu, 26 Mar 2015 09:10:22 -0700
Subject: use new faster/vector impl for chopping conics

BUG=skia:

Review URL: https://codereview.chromium.org/1035943002
---
 bench/PathBench.cpp | 55 +++++++++++------------------------------------------
 1 file changed, 11 insertions(+), 44 deletions(-)

(limited to 'bench/PathBench.cpp')

diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
index 2e91a0b390..a429e2f972 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -806,44 +806,16 @@ private:
 
 #include "SkGeometry.h"
 
-class ConicBench_Chop5 : public Benchmark {
-    SkConic fRQ;
-public:
-    ConicBench_Chop5()  {
-        fRQ.fPts[0].set(0, 0);
-        fRQ.fPts[1].set(100, 0);
-        fRQ.fPts[2].set(100, 100);
-        fRQ.fW = SkScalarCos(SK_ScalarPI/4);
-    }
-
-private:
-    const char* onGetName() override {
-        return "ratquad-chop-0.5";
-    }
-
-    void onDraw(const int loops, SkCanvas*) override {
-        SkConic dst[2];
-        for (int i = 0; i < loops; ++i) {
-            fRQ.chopAt(0.5f, dst);
-        }
-    }
-
-    typedef Benchmark INHERITED;
-};
-
-class ConicBench_ChopHalf : public Benchmark {
+class ConicBench_Chop : public Benchmark {
 protected:
     SkConic fRQ, fDst[2];
     SkString fName;
-    const bool fUseV2;
 public:
-    ConicBench_ChopHalf(bool useV2) : fUseV2(useV2) {
+    ConicBench_Chop() : fName("conic-chop") {
         fRQ.fPts[0].set(0, 0);
         fRQ.fPts[1].set(100, 0);
         fRQ.fPts[2].set(100, 100);
         fRQ.fW = SkScalarCos(SK_ScalarPI/4);
-
-        fName.printf("conic-chop-half%d", useV2);
     }
 
     bool isSuitableFor(Backend backend) override {
@@ -854,25 +826,19 @@ private:
     const char* onGetName() override { return fName.c_str(); }
 
     void onDraw(const int loops, SkCanvas*) override {
-        if (fUseV2) {
-            for (int i = 0; i < loops; ++i) {
-                fRQ.chop2(fDst);
-            }
-        } else {
-            for (int i = 0; i < loops; ++i) {
-                fRQ.chop(fDst);
-            }
+        for (int i = 0; i < loops; ++i) {
+            fRQ.chop(fDst);
         }
     }
 
     typedef Benchmark INHERITED;
 };
-DEF_BENCH( return new ConicBench_ChopHalf(false); )
-DEF_BENCH( return new ConicBench_ChopHalf(true); )
+DEF_BENCH( return new ConicBench_Chop; )
 
-class ConicBench_EvalPos : public ConicBench_ChopHalf {
+class ConicBench_EvalPos : public ConicBench_Chop {
+    const bool fUseV2;
 public:
-    ConicBench_EvalPos(bool useV2) : ConicBench_ChopHalf(useV2) {
+    ConicBench_EvalPos(bool useV2) : fUseV2(useV2) {
         fName.printf("conic-eval-pos%d", useV2);
     }
     void onDraw(const int loops, SkCanvas*) override {
@@ -894,9 +860,10 @@ public:
 DEF_BENCH( return new ConicBench_EvalPos(false); )
 DEF_BENCH( return new ConicBench_EvalPos(true); )
 
-class ConicBench_EvalTan : public ConicBench_ChopHalf {
+class ConicBench_EvalTan : public ConicBench_Chop {
+    const bool fUseV2;
 public:
-    ConicBench_EvalTan(bool useV2) : ConicBench_ChopHalf(useV2) {
+    ConicBench_EvalTan(bool useV2) : fUseV2(useV2) {
         fName.printf("conic-eval-tan%d", useV2);
     }
     void onDraw(const int loops, SkCanvas*) override {
-- 
cgit v1.2.3