From 5423ee17ed5a1becd0aeaa89d8faaaa5e2696cbb Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 7 Jan 2016 09:15:20 -0800 Subject: Revert of SkTreatAsSprite should take AA into account (patchset #5 id:80001 of https://codereview.chromium.org/1566943002/ ) Reason for revert: Need to use SkLeftShift since the arg could be negative Original issue's description: > SkTreatAsSprite should take AA into account > > Currently we always call SkTreatAsSprite with 0 subpixel bits, which means > subpixel translations are ignored. This is incorrect for the anti-aliased > case (drawSprite always pixel-snaps, so we lose edge AA). > > The CL updates SkTreatAsSprite to take an SkPaint argument and use 8 subpixel > bits when AA is requested. > > Also remove unused SkTreatAsSpriteFilter. > > BUG=skia:4761 > R=reed@google.com > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1566943002 > > Committed: https://skia.googlesource.com/skia/+/983dc2541a729609037a05eba731b3eb9788c517 TBR=fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4761 Review URL: https://codereview.chromium.org/1569873003 --- tests/DrawBitmapRectTest.cpp | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'tests/DrawBitmapRectTest.cpp') diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index 88b9437935..2eb181960b 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -82,22 +82,24 @@ static void rand_size(SkISize* size, SkRandom& rand) { size->set(rand.nextU() & 0xFFFF, rand.nextU() & 0xFFFF); } +static bool treat_as_sprite(const SkMatrix& mat, const SkISize& size, + unsigned bits) { + return SkTreatAsSprite(mat, size.width(), size.height(), bits); +} + static void test_treatAsSprite(skiatest::Reporter* reporter) { + const unsigned bilerBits = kSkSubPixelBitsForBilerp; SkMatrix mat; SkISize size; SkRandom rand; - SkPaint noaaPaint; - SkPaint aaPaint; - aaPaint.setAntiAlias(true); - - // assert: translate-only no-aa can always be treated as sprite + // assert: translate-only no-filter can always be treated as sprite for (int i = 0; i < 1000; ++i) { rand_matrix(&mat, rand, SkMatrix::kTranslate_Mask); for (int j = 0; j < 1000; ++j) { rand_size(&size, rand); - REPORTER_ASSERT(reporter, SkTreatAsSprite(mat, size, noaaPaint)); + REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, 0)); } } @@ -106,8 +108,8 @@ static void test_treatAsSprite(skiatest::Reporter* reporter) { rand_matrix(&mat, rand, SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask); for (int j = 0; j < 1000; ++j) { rand_size(&size, rand); - REPORTER_ASSERT(reporter, !SkTreatAsSprite(mat, size, noaaPaint)); - REPORTER_ASSERT(reporter, !SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, 0)); + REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); } } @@ -115,33 +117,33 @@ static void test_treatAsSprite(skiatest::Reporter* reporter) { const SkScalar tooMuchSubpixel = 100.1f; mat.setTranslate(tooMuchSubpixel, 0); - REPORTER_ASSERT(reporter, !SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); mat.setTranslate(0, tooMuchSubpixel); - REPORTER_ASSERT(reporter, !SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); const SkScalar tinySubPixel = 100.02f; mat.setTranslate(tinySubPixel, 0); - REPORTER_ASSERT(reporter, SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, bilerBits)); mat.setTranslate(0, tinySubPixel); - REPORTER_ASSERT(reporter, SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, bilerBits)); const SkScalar twoThirds = SK_Scalar1 * 2 / 3; const SkScalar bigScale = (size.width() + twoThirds) / size.width(); mat.setScale(bigScale, bigScale); - REPORTER_ASSERT(reporter, !SkTreatAsSprite(mat, size, noaaPaint)); - REPORTER_ASSERT(reporter, !SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, false)); + REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); const SkScalar oneThird = SK_Scalar1 / 3; const SkScalar smallScale = (size.width() + oneThird) / size.width(); mat.setScale(smallScale, smallScale); - REPORTER_ASSERT(reporter, SkTreatAsSprite(mat, size, noaaPaint)); - REPORTER_ASSERT(reporter, !SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, false)); + REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); const SkScalar oneFortyth = SK_Scalar1 / 40; const SkScalar tinyScale = (size.width() + oneFortyth) / size.width(); mat.setScale(tinyScale, tinyScale); - REPORTER_ASSERT(reporter, SkTreatAsSprite(mat, size, noaaPaint)); - REPORTER_ASSERT(reporter, SkTreatAsSprite(mat, size, aaPaint)); + REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, false)); + REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, bilerBits)); } static void assert_ifDrawnTo(skiatest::Reporter* reporter, -- cgit v1.2.3