diff options
author | 2018-01-06 18:24:47 +0000 | |
---|---|---|
committer | 2018-01-06 18:24:57 +0000 | |
commit | bd3a0cce99e3be751f9e51e3f22de25d194f9b6f (patch) | |
tree | 094e272dc635e35506f060281588ca268ff8944a /bench | |
parent | 4d1d8bcf6df52bd8e9ae5b0289815c1a2527e7c8 (diff) |
Revert "Revert "remove unused SkCurveMeasure""
This reverts commit 4d1d8bcf6df52bd8e9ae5b0289815c1a2527e7c8.
Reason for revert: will try a manual roll to update static_initializers.gni
Original change's description:
> Revert "remove unused SkCurveMeasure"
>
> This reverts commit 065c2e827e3a5c7aab8f276b1f5358ba3ac33fa8.
>
> Reason for revert: change static initializer count?
>
> Original change's description:
> > remove unused SkCurveMeasure
> >
> > Bug: skia:
> > Change-Id: I36eb00883bc17e8eef4d1d226972f0125f0e2630
> > Reviewed-on: https://skia-review.googlesource.com/91702
> > Reviewed-by: Mike Reed <reed@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
>
> TBR=reed@google.com
>
> Change-Id: I0d8ad2aa8b38a389048ba8bf5cafafea5788c3e1
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/91343
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=reed@google.com
Change-Id: I7e6dfc5841b089dff047cd1d78dcebb722cdf8a4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/91361
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'bench')
-rw-r--r-- | bench/MeasureBench.cpp | 177 |
1 files changed, 0 insertions, 177 deletions
diff --git a/bench/MeasureBench.cpp b/bench/MeasureBench.cpp deleted file mode 100644 index 1b0ec21dc9..0000000000 --- a/bench/MeasureBench.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -// for std::max -#include <algorithm> - -#include "Benchmark.h" -#include "SkCurveMeasure.h" -#include "SkPath.h" -#include "SkPathMeasure.h" -#include "SkString.h" - -#define NORMALIZE_LOOPS - -class MeasureBench : public Benchmark { - protected: - SkString fName; - - SkPath fPath; - - bool fUsePathMeasure; - float fSize; - size_t fPieces; - - SkPoint fPts[3]; - - public: - MeasureBench(bool usePathMeasure, float size, size_t pieces) - : fUsePathMeasure(usePathMeasure), - fSize(size), - fPieces(pieces) { - fName.printf("measure_%s_%.1f_" SK_SIZE_T_SPECIFIER, - fUsePathMeasure ? "pathMeasure" : "curveMeasure", fSize, - fPieces); - - auto p1 = SkPoint::Make(0, 0); - auto p2 = SkPoint::Make(30*fSize, 0); - auto p3 = SkPoint::Make(15*fSize, 15*fSize); - - fPts[0] = p1; - fPts[1] = p2; - fPts[2] = p3; - - this->setPath(); - } - - protected: - const char* onGetName() override { return fName.c_str(); } - - void setPath() { - fPath.moveTo(fPts[0]); - fPath.quadTo(fPts[1], fPts[2]); - } - - int numLoops() { -#ifdef NORMALIZE_LOOPS - // arbitrary heuristic - return std::max(2, 10000 / ((int)fSize*(int)fPieces)); -#else - return 1000; -#endif // NORMALIZE_LOOPS - } - - //// measurement code - - void do_pathMeasure(SkCanvas* canvas) { - SkPathMeasure meas(fPath, false); - - SkScalar totalLength = meas.getLength(); - SkScalar pieceLength = totalLength / fPieces; - - SkPoint point; - for (size_t i = 0; i <= fPieces; i++) { - if (meas.getPosTan(i * pieceLength, &point, nullptr)) { - }; - } - } - - void do_curveMeasure(SkCanvas* canvas) { - SkCurveMeasure meas(fPts, kQuad_SegType); - - SkScalar totalLength = meas.getLength(); - SkScalar pieceLength = totalLength / fPieces; - - SkPoint point; - for (size_t i = 0; i <= fPieces; i++) { - meas.getPosTanTime(i*pieceLength, &point, nullptr, nullptr); - } - } - - void onDraw(int loops, SkCanvas* canvas) override { - int inner_loops = numLoops(); - for (int i = 0; i < loops; i++) { - for (int j = 0; j < inner_loops; j++) { - if (fUsePathMeasure) { - do_pathMeasure(canvas); - } - else { - do_curveMeasure(canvas); - } - } - } - } - - private: - typedef Benchmark INHERITED; -}; - -/////////////////////////////////////////////////////////////////////////////// - -DEF_BENCH(return new MeasureBench(true, 1, 2);) -DEF_BENCH(return new MeasureBench(true, 2, 2);) -DEF_BENCH(return new MeasureBench(true, 10, 2);) -DEF_BENCH(return new MeasureBench(true, 100, 2);) -DEF_BENCH(return new MeasureBench(true, 1000, 2);) - -DEF_BENCH(return new MeasureBench(true, 1, 1);) -DEF_BENCH(return new MeasureBench(true, 1, 2);) -DEF_BENCH(return new MeasureBench(true, 1, 3);) -DEF_BENCH(return new MeasureBench(true, 1, 4);) -DEF_BENCH(return new MeasureBench(true, 1, 5);) -DEF_BENCH(return new MeasureBench(true, 2, 1);) -DEF_BENCH(return new MeasureBench(true, 2, 2);) -DEF_BENCH(return new MeasureBench(true, 2, 3);) -DEF_BENCH(return new MeasureBench(true, 2, 4);) -DEF_BENCH(return new MeasureBench(true, 2, 5);) -DEF_BENCH(return new MeasureBench(true, 10, 10);) -DEF_BENCH(return new MeasureBench(true, 10, 20);) -DEF_BENCH(return new MeasureBench(true, 10, 30);) -DEF_BENCH(return new MeasureBench(true, 10, 40);) -DEF_BENCH(return new MeasureBench(true, 10, 50);) -DEF_BENCH(return new MeasureBench(true, 100, 100);) -DEF_BENCH(return new MeasureBench(true, 100, 200);) -DEF_BENCH(return new MeasureBench(true, 100, 300);) -DEF_BENCH(return new MeasureBench(true, 100, 400);) -DEF_BENCH(return new MeasureBench(true, 100, 500);) -DEF_BENCH(return new MeasureBench(true, 1000, 1000);) -DEF_BENCH(return new MeasureBench(true, 1000, 2000);) -DEF_BENCH(return new MeasureBench(true, 1000, 3000);) -DEF_BENCH(return new MeasureBench(true, 1000, 4000);) -DEF_BENCH(return new MeasureBench(true, 1000, 5000);) - -DEF_BENCH(return new MeasureBench(false, 1, 2);) -DEF_BENCH(return new MeasureBench(false, 2, 2);) -DEF_BENCH(return new MeasureBench(false, 10, 2);) -DEF_BENCH(return new MeasureBench(false, 100, 2);) -DEF_BENCH(return new MeasureBench(false, 1000, 2);) - -DEF_BENCH(return new MeasureBench(false, 1, 1);) -DEF_BENCH(return new MeasureBench(false, 1, 2);) -DEF_BENCH(return new MeasureBench(false, 1, 3);) -DEF_BENCH(return new MeasureBench(false, 1, 4);) -DEF_BENCH(return new MeasureBench(false, 1, 5);) -DEF_BENCH(return new MeasureBench(false, 2, 1);) -DEF_BENCH(return new MeasureBench(false, 2, 2);) -DEF_BENCH(return new MeasureBench(false, 2, 3);) -DEF_BENCH(return new MeasureBench(false, 2, 4);) -DEF_BENCH(return new MeasureBench(false, 2, 5);) -DEF_BENCH(return new MeasureBench(false, 10, 10);) -DEF_BENCH(return new MeasureBench(false, 10, 20);) -DEF_BENCH(return new MeasureBench(false, 10, 30);) -DEF_BENCH(return new MeasureBench(false, 10, 40);) -DEF_BENCH(return new MeasureBench(false, 10, 50);) -DEF_BENCH(return new MeasureBench(false, 100, 100);) -DEF_BENCH(return new MeasureBench(false, 100, 200);) -DEF_BENCH(return new MeasureBench(false, 100, 300);) -DEF_BENCH(return new MeasureBench(false, 100, 400);) -DEF_BENCH(return new MeasureBench(false, 100, 500);) -DEF_BENCH(return new MeasureBench(false, 1000, 1000);) -DEF_BENCH(return new MeasureBench(false, 1000, 2000);) -DEF_BENCH(return new MeasureBench(false, 1000, 3000);) -DEF_BENCH(return new MeasureBench(false, 1000, 4000);) -DEF_BENCH(return new MeasureBench(false, 1000, 5000);) |