diff options
author | robertphillips <robertphillips@google.com> | 2016-08-04 09:03:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-04 09:03:20 -0700 |
commit | 276d3286b32900d8b7e895c5224ceba1922d2391 (patch) | |
tree | ff4bdbe68e8d4106a9c9ba939d61ebd000ca6272 | |
parent | 15c42ca310e8b9785eab38b3dd36265948e85b0e (diff) |
Add new bench for occluded blurmaskfilter draws
w/ occluders
44/44 MB 6 497us 500us 500us 502us 0% .oOOooooOO gpu bluroccludedrrect
w/o occluders
41/41 MB 5 1.08ms 1.09ms 1.12ms 1.47ms 11% .........O gpu bluroccludedrrect
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2203153002
Review-Url: https://codereview.chromium.org/2203153002
-rw-r--r-- | bench/BlurOccludedRRectBench.cpp | 87 | ||||
-rw-r--r-- | tools/sk_tool_utils.cpp | 50 | ||||
-rw-r--r-- | tools/sk_tool_utils.h | 3 |
3 files changed, 140 insertions, 0 deletions
diff --git a/bench/BlurOccludedRRectBench.cpp b/bench/BlurOccludedRRectBench.cpp new file mode 100644 index 0000000000..a2e8276776 --- /dev/null +++ b/bench/BlurOccludedRRectBench.cpp @@ -0,0 +1,87 @@ +/* + * Copyright 2016 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "Benchmark.h" +#include "SkBlurMaskFilter.h" +#include "SkCanvas.h" +#include "SkPaint.h" +#include "SkRRect.h" +#include "SkRect.h" +#include "sk_tool_utils.h" + +class BlurOccludedRRectBench : public Benchmark { +public: + BlurOccludedRRectBench() {} + + const char* onGetName() override { + return "bluroccludedrrect"; + } + + SkIPoint onGetSize() override { + return SkIPoint::Make(1024, 2048); + } + + void onDraw(int loops, SkCanvas* canvas) override { + for (int l = 0; l < loops; ++l) { + canvas->clear(0xFFFAFAFA); + + SkPaint opaque; + opaque.setAntiAlias(true); + opaque.setColor(SK_ColorWHITE); + + const SkRect r = SkRect::MakeWH(480, 230); + const SkRRect rr = SkRRect::MakeRectXY(r, 8, 8); + //SkRect occRect = sk_tool_utils::compute_central_occluder(rr); + + for (int i = 0; i < 2; ++i) { + canvas->save(); + + canvas->translate(i*502.0f+20, 10.0f); + + for (int j = 0; j < 8; ++j) { + canvas->save(); + + canvas->translate(0.0f, j*256.0f); + + SkPaint firstBlur; + firstBlur.setAntiAlias(true); + firstBlur.setColor(0x09000000); + firstBlur.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + 2.5f)); + //, occRect)); + + canvas->drawRRect(rr, firstBlur); + + canvas->save(); + canvas->translate(1.5f, 1.5f); + + SkPaint secondBlur; + secondBlur.setAntiAlias(true); + secondBlur.setColor(0x30000000); + secondBlur.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + 6.0f)); + //, occRect)); + + canvas->drawRRect(rr, secondBlur); + + canvas->restore(); + + canvas->drawRRect(rr, opaque); + + canvas->restore(); + } + + canvas->restore(); + } + } + } + +private: + typedef Benchmark INHERITED; +}; + +DEF_BENCH(return new BlurOccludedRRectBench();) diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index 9f398e2fc0..38880f8204 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -463,4 +463,54 @@ SkBitmap slow_blur(const SkBitmap& src, float sigma) { return dst; } +// compute the intersection point between the diagonal and the ellipse in the +// lower right corner +static SkPoint intersection(SkScalar w, SkScalar h) { + SkASSERT(w > 0.0f || h > 0.0f); + + return SkPoint::Make(w / SK_ScalarSqrt2, h / SK_ScalarSqrt2); +} + +// Use the intersection of the corners' diagonals with their ellipses to shrink +// the bounding rect +SkRect compute_central_occluder(const SkRRect& rr) { + const SkRect r = rr.getBounds(); + + SkScalar newL = r.fLeft, newT = r.fTop, newR = r.fRight, newB = r.fBottom; + + SkVector radii = rr.radii(SkRRect::kUpperLeft_Corner); + if (!radii.isZero()) { + SkPoint p = intersection(radii.fX, radii.fY); + + newL = SkTMax(newL, r.fLeft + radii.fX - p.fX); + newT = SkTMax(newT, r.fTop + radii.fY - p.fY); + } + + radii = rr.radii(SkRRect::kUpperRight_Corner); + if (!radii.isZero()) { + SkPoint p = intersection(radii.fX, radii.fY); + + newR = SkTMin(newR, r.fRight + p.fX - radii.fX); + newT = SkTMax(newT, r.fTop + radii.fY - p.fY); + } + + radii = rr.radii(SkRRect::kLowerRight_Corner); + if (!radii.isZero()) { + SkPoint p = intersection(radii.fX, radii.fY); + + newR = SkTMin(newR, r.fRight + p.fX - radii.fX); + newB = SkTMin(newB, r.fBottom - radii.fY + p.fY); + } + + radii = rr.radii(SkRRect::kLowerLeft_Corner); + if (!radii.isZero()) { + SkPoint p = intersection(radii.fX, radii.fY); + + newL = SkTMax(newL, r.fLeft + radii.fX - p.fX); + newB = SkTMin(newB, r.fBottom - radii.fY + p.fY); + } + + return SkRect::MakeLTRB(newL, newT, newR, newB); +} + } // namespace sk_tool_utils diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h index c4d7c8a265..c13d99f2d4 100644 --- a/tools/sk_tool_utils.h +++ b/tools/sk_tool_utils.h @@ -20,6 +20,7 @@ class SkBitmap; class SkCanvas; class SkPaint; class SkPath; +class SkRRect; class SkShader; class SkTestFont; class SkTextBlobBuilder; @@ -130,6 +131,8 @@ namespace sk_tool_utils { // so it is slow! SkBitmap slow_blur(const SkBitmap& src, float sigma); + SkRect compute_central_occluder(const SkRRect& rr); + // A helper object to test the topological sorting code (TopoSortBench.cpp & TopoSortTest.cpp) class TopoTestNode { public: |