AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Skip bilerp for integral-translate-only matrices (!clamp-clamp case)

Browse Source 
We've landed https://skia-review.googlesource.com/24126 to restore this
optimization, but we check too late: for non-clamp/clamp cases we'd
already adjusted the matrix scale, so the optimization never kicks in.

Relocate the integral translation check before all other matrix
adjustments.

BUG=chromium:744674

Change-Id: I395d327c3ddf74dc6d23bb8aee782ec62a7373f1
Reviewed-on: https://skia-review.googlesource.com/34840
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Florin Malita 2017-08-15 15:44:04 -04:00 committed by Skia Commit-Bot
parent 03776fc0d7
commit 3ad19e5957
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/SkBitmapProcState.cpp
View File

@ -100,38 +100,48 @@ bool SkBitmapProcInfo::init(const SkMatrix& inv, const SkPaint& paint) {
SkASSERT(fFilterQuality <= kLow_SkFilterQuality); SkASSERT(fFilterQuality <= kLow_SkFilterQuality);
SkASSERT(fPixmap.addr()); SkASSERT(fPixmap.addr());
// Most of the scanline procs deal with "unit" texture coordinates, as this #ifdef SK_SUPPORT_LEGACY_BILERP2
// makes it easy to perform tiling modes (repeat = (x & 0xFFFF)). To generate bool integral_translate_only = false;
// those, we divide the matrix by its dimensions here. #else
// bool integral_translate_only = just_trans_integral(fInvMatrix);
// We don't do this if we're either trivial (can ignore the matrix) or clamping #endif
// in both X and Y since clamping to width,height is just as easy as to 0xFFFF. if (!integral_translate_only) {
// Most of the scanline procs deal with "unit" texture coordinates, as this
// makes it easy to perform tiling modes (repeat = (x & 0xFFFF)). To generate
// those, we divide the matrix by its dimensions here.
//
// We don't do this if we're either trivial (can ignore the matrix) or clamping
// in both X and Y since clamping to width,height is just as easy as to 0xFFFF.
if (fTileModeX != SkShader::kClamp_TileMode || if (fTileModeX != SkShader::kClamp_TileMode ||
fTileModeY != SkShader::kClamp_TileMode) { fTileModeY != SkShader::kClamp_TileMode) {
fInvMatrix.postIDiv(fPixmap.width(), fPixmap.height()); fInvMatrix.postIDiv(fPixmap.width(), fPixmap.height());
}
// Now that all possible changes to the matrix have taken place, check
// to see if we're really close to a no-scale matrix. If so, explicitly
// set it to be so. Subsequent code may inspect this matrix to choose
// a faster path in this case.
// This code will only execute if the matrix has some scale component;
// if it's already pure translate then we won't do this inversion.
if (matrix_only_scale_translate(fInvMatrix)) {
SkMatrix forward;
if (fInvMatrix.invert(&forward) && just_trans_general(forward)) {
fInvMatrix.setTranslate(-forward.getTranslateX(), -forward.getTranslateY());
} }
// Now that all possible changes to the matrix have taken place, check
// to see if we're really close to a no-scale matrix. If so, explicitly
// set it to be so. Subsequent code may inspect this matrix to choose
// a faster path in this case.
// This code will only execute if the matrix has some scale component;
// if it's already pure translate then we won't do this inversion.
if (matrix_only_scale_translate(fInvMatrix)) {
SkMatrix forward;
if (fInvMatrix.invert(&forward) && just_trans_general(forward)) {
fInvMatrix.setTranslate(-forward.getTranslateX(), -forward.getTranslateY());
}
}
// Recompute the flag after matrix adjustments.
integral_translate_only = just_trans_integral(fInvMatrix);
} }
fInvType = fInvMatrix.getType(); fInvType = fInvMatrix.getType();
if (kLow_SkFilterQuality == fFilterQuality && if (kLow_SkFilterQuality == fFilterQuality &&
(!valid_for_filtering(fPixmap.width() | fPixmap.height()) || (!valid_for_filtering(fPixmap.width() | fPixmap.height()) ||
just_trans_integral(fInvMatrix))) { integral_translate_only)) {
fFilterQuality = kNone_SkFilterQuality; fFilterQuality = kNone_SkFilterQuality;
} }