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
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index a4acbdc..e5ca9ce 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2220,7 +2220,8 @@
}
const SkMatrix& ctm = this->getTotalMatrix();
- if (!SkTreatAsSprite(ctm, SkISize::Make(w, h), paint)) {
+ const unsigned kSubpixelBits = 0; // matching SkDraw::drawBitmap()
+ if (!SkTreatAsSprite(ctm, w, h, kSubpixelBits)) {
return false;
}
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 246c31b..249795d 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1172,11 +1172,20 @@
proc(*devPathPtr, *fRC, blitter);
}
+/** For the purposes of drawing bitmaps, if a matrix is "almost" translate
+ go ahead and treat it as if it were, so that subsequent code can go fast.
+ */
+static bool just_translate(const SkMatrix& matrix, const SkBitmap& bitmap) {
+ unsigned bits = 0; // TODO: find a way to allow the caller to tell us to
+ // respect filtering.
+ return SkTreatAsSprite(matrix, bitmap.width(), bitmap.height(), bits);
+}
+
void SkDraw::drawBitmapAsMask(const SkBitmap& bitmap,
const SkPaint& paint) const {
SkASSERT(bitmap.colorType() == kAlpha_8_SkColorType);
- if (SkTreatAsSprite(*fMatrix, bitmap.dimensions(), paint)) {
+ if (just_translate(*fMatrix, bitmap)) {
int ix = SkScalarRoundToInt(fMatrix->getTranslateX());
int iy = SkScalarRoundToInt(fMatrix->getTranslateY());
@@ -1291,8 +1300,7 @@
return;
}
- if (bitmap.colorType() != kAlpha_8_SkColorType
- && SkTreatAsSprite(matrix, bitmap.dimensions(), paint)) {
+ if (bitmap.colorType() != kAlpha_8_SkColorType && just_translate(matrix, bitmap)) {
//
// It is safe to call lock pixels now, since we know the matrix is
// (more or less) identity.
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index 13c626a..dfeb721 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1623,14 +1623,8 @@
#include "SkMatrixUtils.h"
-bool SkTreatAsSprite(const SkMatrix& mat, const SkISize& size, const SkPaint& paint) {
- // Our path aa is 2-bits, and our rect aa is 8, so we could use 8,
- // but in practice 4 seems enough (still looks smooth) and allows
- // more slightly fractional cases to fall into the fast (sprite) case.
- static const unsigned kAntiAliasSubpixelBits = 4;
-
- const unsigned subpixelBits = paint.isAntiAlias() ? kAntiAliasSubpixelBits : 0;
-
+bool SkTreatAsSprite(const SkMatrix& mat, int width, int height,
+ unsigned subpixelBits) {
// quick reject on affine or perspective
if (mat.getType() & ~(SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask)) {
return false;
@@ -1647,7 +1641,7 @@
}
SkRect dst;
- SkIRect isrc = SkIRect::MakeSize(size);
+ SkIRect isrc = { 0, 0, width, height };
{
SkRect src;
diff --git a/src/core/SkMatrixUtils.h b/src/core/SkMatrixUtils.h
index 0e01fbe..d1b6658 100644
--- a/src/core/SkMatrixUtils.h
+++ b/src/core/SkMatrixUtils.h
@@ -8,20 +8,37 @@
#ifndef SkMatrixUtils_DEFINED
#define SkMatrixUtils_DEFINED
-#include "SkSize.h"
-
-class SkMatrix;
-class SkPaint;
+#include "SkMatrix.h"
/**
- * Given a matrix, size and paint, return true if the computed dst-rect would
+ * Number of subpixel bits used in skia's bilerp.
+ * See SkBitmapProcState_procs.h and SkBitmapProcState_filter.h
+ */
+#define kSkSubPixelBitsForBilerp 4
+
+/**
+ * Given a matrix and width/height, return true if the computed dst-rect would
* align such that there is a 1-to-1 coorspondence between src and dst pixels.
* This can be called by drawing code to see if drawBitmap can be turned into
* drawSprite (which is faster).
*
- * The src-rect is defined to be { 0, 0, size.width(), size.height() }
+ * The src-rect is defined to be { 0, 0, width, height }
+ *
+ * The "closeness" test is based on the subpixelBits parameter. Pass 0 for
+ * round-to-nearest behavior (e.g. nearest neighbor sampling). Pass the number
+ * of subpixel-bits to simulate filtering.
*/
-bool SkTreatAsSprite(const SkMatrix&, const SkISize& size, const SkPaint& paint);
+bool SkTreatAsSprite(const SkMatrix&, int width, int height,
+ unsigned subpixelBits);
+
+/**
+ * Calls SkTreatAsSprite() with default subpixelBits value to match Skia's
+ * filter-bitmap implementation (i.e. kSkSubPixelBitsForBilerp).
+ */
+static inline bool SkTreatAsSpriteFilter(const SkMatrix& matrix,
+ int width, int height) {
+ return SkTreatAsSprite(matrix, width, height, kSkSubPixelBitsForBilerp);
+}
/** Decomposes the upper-left 2x2 of the matrix into a rotation (represented by
the cosine and sine of the rotation angle), followed by a non-uniform scale,
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index 88b9437..2eb1819 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -82,22 +82,24 @@
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 @@
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 @@
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,