diff options
author | 2017-07-22 02:06:29 +0000 | |
---|---|---|
committer | 2017-07-22 02:06:37 +0000 | |
commit | f5d4d86d857fd3619ae5f253cb8cc2552f552542 (patch) | |
tree | 4f9da598bf2320684e4bb4f43de7b0d0217c32da /src/shaders | |
parent | cd1416efbc7af6f115dbaa09dce48e075d1d96ca (diff) |
Revert "use rasterpipeline for filtering for very large images"
This reverts commit 97d4cf0e7eb15340b1f513ff8cfba4e55ee3acf2.
Reason for revert: looks like this is breaking one cc unit test, LayerTreeHostScrollbarsPixelTest.HugeTransformScale, which appears to be a comparison against a golden .png.
Original change's description:
> use rasterpipeline for filtering for very large images
>
> Bug: skia:
> Change-Id: I8d1c2fca1bf2ad94cdfbef32d068f47503ea1e03
> Reviewed-on: https://skia-review.googlesource.com/24140
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
TBR=mtklein@google.com,fmalita@chromium.org,reed@google.com
Change-Id: Idc94873cca90a73fbd567b16ed2c45b961e76e85
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/25806
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/shaders')
-rw-r--r-- | src/shaders/SkImageShader.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index 6cd63bb6fb..dd0537ef92 100644 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -77,20 +77,10 @@ bool SkImageShader::IsRasterPipelineOnly(SkColorType ct, SkAlphaType at, return false; } -static bool valid_for_legacy_filtering(unsigned dimension) { - // for filtering, width and height must fit in 14bits, since we use steal - // 2 bits from each to store our 4bit subpixel data - return (dimension & ~0x3FFF) == 0; -} - bool SkImageShader::onIsRasterPipelineOnly() const { SkBitmapProvider provider(fImage.get(), nullptr); - const SkImageInfo info = provider.info(); - - if (!valid_for_legacy_filtering(info.width()) || !valid_for_legacy_filtering(info.height())) { - return true; - } - return IsRasterPipelineOnly(info.colorType(), info.alphaType(), fTileModeX, fTileModeY); + return IsRasterPipelineOnly(provider.info().colorType(), provider.info().alphaType(), + fTileModeX, fTileModeY); } SkShaderBase::Context* SkImageShader::onMakeContext(const ContextRec& rec, |