aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/QuickRejectTest.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2016-08-12 02:22:33 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-12 02:22:33 -0700
commit5aeb2fa25384b9d3202a1e8c6cd6832038419fe6 (patch)
treec60a7144ccde408e38e4555f2d112699d99bdcc1 /tests/QuickRejectTest.cpp
parentcf736d7b66d76917c3384c0ad2f4cdc6d52db2a1 (diff)
Revert of Optimized implementation of quickReject() (patchset #12 id:260001 of https://codereview.chromium.org/2225393002/ )
Reason for revert: New assert triggering in the Chrome roll, https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_asan_rel_ng/builds/208750/steps/webkit_unit_tests%20%28with%20patch%29%20on%20Ubuntu-12.04/logs/FrameThrottlingTest.SynchronousLayoutInAnimationFrameCallback and breaks the SKNX_NO_SIMD bot, https://codereview.chromium.org/2236363004 Original issue's description: > 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 > > Committed: https://skia.googlesource.com/skia/+/d22a817ff57986407facd16af36320fc86ce02da TBR=reed@google.com,herb@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2231393003
Diffstat (limited to 'tests/QuickRejectTest.cpp')
-rw-r--r--tests/QuickRejectTest.cpp38
1 files changed, 0 insertions, 38 deletions
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index b39484bd89..6a978743f6 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -103,45 +103,7 @@ 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);
}