aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2017-08-17 21:04:03 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-18 01:24:18 +0000
commit6274c42b8241fba14b003c55e6997cfe274a1066 (patch)
treef2cf5dec27818383518e80263a6cf4a9e411f1ab /src
parentd76a184efd504e3220d02869ab10e9b4a0e0bcb0 (diff)
Add back raster pipeline image tiling guard
(SK_SUPPORT_LEGACY_TILED_BITMAPS) We have a couple of M61 regressions related to this change. Adding the guard back in case we decide to revert. TBR= Change-Id: I0703e61d70aa919b71ff9711ec28bcfc67e3e84a Reviewed-on: https://skia-review.googlesource.com/36120 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/shaders/SkImageShader.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index edd1f41dca..ce1c463307 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -69,9 +69,11 @@ bool SkImageShader::IsRasterPipelineOnly(const SkMatrix& ctm, SkColorType ct, Sk
if (at == kUnpremul_SkAlphaType) {
return true;
}
+#ifndef SK_SUPPORT_LEGACY_TILED_BITMAPS
if (tx != ty) {
return true;
}
+#endif
#ifndef SK_SUPPORT_LEGACY_ROTATED_SHADERS
if (!ctm.isScaleTranslate()) {
return true;