From d22a817ff57986407facd16af36320fc86ce02da Mon Sep 17 00:00:00 2001 From: msarett Date: Thu, 11 Aug 2016 14:40:03 -0700 Subject: Optimized implementation of quickReject() Impl Overview (1) Keep the device clip bounds up to date. This requires minimal additional work in a few places throughout canvas. (2) Keep track of if the ctm isScaleTranslate. Yes, there's a function that does this, but it's slow to call. (3) Perform the src->device transform in quick reject, then check intersection/nan. Other Notes: (1) NaN and intersection checks are performed simultaneously. (2) We no longer quick reject infinity. (3) Affine and perspective are both handled in the slow case. (4) SkRasterClip::isEmpty() is handled by the intersection check. Performance on Nexus 6P: 93.2ms -> 59.8ms Overall Android Jank Tests Performance Impact: Should gain us a ms or two on some tests. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2225393002 Review-Url: https://codereview.chromium.org/2225393002 --- tests/QuickRejectTest.cpp | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'tests/QuickRejectTest.cpp') diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp index 6a978743f6..b39484bd89 100644 --- a/tests/QuickRejectTest.cpp +++ b/tests/QuickRejectTest.cpp @@ -103,7 +103,45 @@ static void test_layers(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, false == canvas.quickReject(SkRect::MakeWH(60, 60))); } +static void test_quick_reject(skiatest::Reporter* reporter) { + SkCanvas canvas(100, 100); + SkRect r0 = SkRect::MakeLTRB(-50.0f, -50.0f, 50.0f, 50.0f); + SkRect r1 = SkRect::MakeLTRB(-50.0f, 110.0f, 50.0f, 120.0f); + SkRect r2 = SkRect::MakeLTRB(110.0f, -50.0f, 120.0f, 50.0f); + SkRect r3 = SkRect::MakeLTRB(-120.0f, -50.0f, 120.0f, 50.0f); + SkRect r4 = SkRect::MakeLTRB(-50.0f, -120.0f, 50.0f, 120.0f); + SkRect r5 = SkRect::MakeLTRB(-120.0f, -120.0f, 120.0f, 120.0f); + SkRect r6 = SkRect::MakeLTRB(-120.0f, -120.0f, -110.0f, -110.0f); + SkRect r7 = SkRect::MakeLTRB(SK_ScalarNaN, -50.0f, 50.0f, 50.0f); + SkRect r8 = SkRect::MakeLTRB(-50.0f, SK_ScalarNaN, 50.0f, 50.0f); + SkRect r9 = SkRect::MakeLTRB(-50.0f, -50.0f, SK_ScalarNaN, 50.0f); + SkRect r10 = SkRect::MakeLTRB(-50.0f, -50.0f, 50.0f, SK_ScalarNaN); + REPORTER_ASSERT(reporter, false == canvas.quickReject(r0)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r1)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r2)); + REPORTER_ASSERT(reporter, false == canvas.quickReject(r3)); + REPORTER_ASSERT(reporter, false == canvas.quickReject(r4)); + REPORTER_ASSERT(reporter, false == canvas.quickReject(r5)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r6)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r7)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r8)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r9)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r10)); + + SkMatrix m = SkMatrix::MakeScale(2.0f); + m.setTranslateX(10.0f); + m.setTranslateY(10.0f); + canvas.setMatrix(m); + SkRect r11 = SkRect::MakeLTRB(5.0f, 5.0f, 100.0f, 100.0f); + SkRect r12 = SkRect::MakeLTRB(5.0f, 50.0f, 100.0f, 100.0f); + SkRect r13 = SkRect::MakeLTRB(50.0f, 5.0f, 100.0f, 100.0f); + REPORTER_ASSERT(reporter, false == canvas.quickReject(r11)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r12)); + REPORTER_ASSERT(reporter, true == canvas.quickReject(r13)); +} + DEF_TEST(QuickReject, reporter) { test_drawBitmap(reporter); test_layers(reporter); + test_quick_reject(reporter); } -- cgit v1.2.3