diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-07-20 08:59:19 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-20 16:45:52 +0000 |
| commit | 0fddb2d7c17a953c0d3986e5f8bcfdeaf2cc401d (patch) | |
| tree | 3ed6fbbb1d4aa8931233de5d4e2e9aa2ab224f8a /src/shaders/SkPictureShader.cpp | |
| parent | edfe3dfb47bd3248a588c2eb89224f59939bd626 (diff) | |
Retry cleaning up SkLinearBitmapPipeline.
This is mostly dead code.
In order to make it truly dead, we need to opt drawing unpremul images
into SkRasterPipelineBlitter. They had been handled by
SkLinearBitmapPipeline, but can't be draw by SkBitmapProcLegacyShader.
Drawing unpremul images is tested by the GM all_variants_8888, which
gave us trouble last time around (serialize-8888 drew right, 8888 wrong)
but now draws fine. I think this was probably also the root of the
revert, drawing some unpremul image in Chrome's tests somewhere.
Change-Id: I453f9df44ade807316935921cbae82961e2f08aa
Reviewed-on: https://skia-review.googlesource.com/24862
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/shaders/SkPictureShader.cpp')
| -rw-r--r-- | src/shaders/SkPictureShader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp index 5a0d70e5af..679fb9d5fe 100644 --- a/src/shaders/SkPictureShader.cpp +++ b/src/shaders/SkPictureShader.cpp @@ -292,7 +292,7 @@ sk_sp<SkShader> SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix, con } bool SkPictureShader::onIsRasterPipelineOnly() const { - return SkImageShader::IsRasterPipelineOnly(kN32_SkColorType, fTmx, fTmy); + return SkImageShader::IsRasterPipelineOnly(kN32_SkColorType, kPremul_SkAlphaType, fTmx, fTmy); } bool SkPictureShader::onAppendStages(SkRasterPipeline* p, SkColorSpace* cs, SkArenaAlloc* alloc, |