diff options
| -rw-r--r-- | bench/LineBench.cpp | 51 |
1 files changed, 12 insertions, 39 deletions
diff --git a/bench/LineBench.cpp b/bench/LineBench.cpp index 3127d4efec..67dc5648be 100644 --- a/bench/LineBench.cpp +++ b/bench/LineBench.cpp @@ -21,33 +21,19 @@ class LineBench : public Benchmark { bool fDoAA; SkString fName; enum { - LINES = 500, + PTS = 500, }; - SkPoint fStartPts[LINES]; - SkPoint fEndPts[LINES]; + SkPoint fPts[PTS]; public: - enum LineType { - SH, // Straight + horizontally - SV, // Straight + vertically - RAND, - }; - LineBench(SkScalar width, bool doAA, LineType type) { + LineBench(SkScalar width, bool doAA) { fStrokeWidth = width; fDoAA = doAA; - fName.printf("lines_%g_%s_%s", width, doAA ? "AA" : "BW", - type == SH ? "SH" : (type == SV ? "SV" : "RAND")); + fName.printf("lines_%g_%s", width, doAA ? "AA" : "BW"); SkRandom rand; - for (int i = 0; i < LINES; ++i) { - fStartPts[i].set(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480); - if (type == SH) { - fEndPts[i].set(rand.nextUScalar1() * 640, fStartPts[i].y()); - } else if (type == SV) { - fEndPts[i].set(fStartPts[i].x(), rand.nextUScalar1() * 480); - } else { - fEndPts[i].set(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480); - } + for (int i = 0; i < PTS; ++i) { + fPts[i].set(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480); } } @@ -65,7 +51,7 @@ protected: paint.setStrokeWidth(fStrokeWidth); for (int i = 0; i < loops; i++) { - canvas->drawLine(fStartPts[i].x(), fStartPts[i].y(), fEndPts[i].x(), fEndPts[i].y(), paint); + canvas->drawPoints(SkCanvas::kLines_PointMode, PTS, fPts, paint); } } @@ -73,21 +59,8 @@ private: typedef Benchmark INHERITED; }; -DEF_BENCH(return new LineBench(0, false, LineBench::SH);) -DEF_BENCH(return new LineBench(SK_Scalar1, false, LineBench::SH);) -DEF_BENCH(return new LineBench(0, true, LineBench::SH);) -DEF_BENCH(return new LineBench(SK_Scalar1/2, true, LineBench::SH);) -DEF_BENCH(return new LineBench(SK_Scalar1, true, LineBench::SH);) -DEF_BENCH(return new LineBench(SK_Scalar1*10,true, LineBench::SH);) -DEF_BENCH(return new LineBench(0, false, LineBench::SV);) -DEF_BENCH(return new LineBench(SK_Scalar1, false, LineBench::SV);) -DEF_BENCH(return new LineBench(0, true, LineBench::SV);) -DEF_BENCH(return new LineBench(SK_Scalar1/2, true, LineBench::SV);) -DEF_BENCH(return new LineBench(SK_Scalar1, true, LineBench::SV);) -DEF_BENCH(return new LineBench(SK_Scalar1*10,true, LineBench::SV);) -DEF_BENCH(return new LineBench(0, false, LineBench::RAND);) -DEF_BENCH(return new LineBench(SK_Scalar1, false, LineBench::RAND);) -DEF_BENCH(return new LineBench(0, true, LineBench::RAND);) -DEF_BENCH(return new LineBench(SK_Scalar1/2, true, LineBench::RAND);) -DEF_BENCH(return new LineBench(SK_Scalar1, true, LineBench::RAND);) -DEF_BENCH(return new LineBench(SK_Scalar1*10,true, LineBench::RAND);) +DEF_BENCH(return new LineBench(0, false);) +DEF_BENCH(return new LineBench(SK_Scalar1, false);) +DEF_BENCH(return new LineBench(0, true);) +DEF_BENCH(return new LineBench(SK_Scalar1/2, true);) +DEF_BENCH(return new LineBench(SK_Scalar1, true);) |