diff options
author | Matt Sarett <msarett@google.com> | 2017-01-12 21:03:17 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-12 21:03:28 +0000 |
commit | 25b60833e7c3dd25f2317b3f0e7af07f04b5beba (patch) | |
tree | 557ce5ae781109521da3b18b44824fe00b01ea08 /src/codec/SkSwizzler.cpp | |
parent | 9e937af9bd0ef211ffcaca1bae3a6a74581c5992 (diff) |
Revert "Use RasterPipeline to support full precision on 16-bit RGBA pngs"
This reverts commit bb2339da39ab3ee59121acd911920dafcd4a2f72.
Reason for revert: Breaks MSAN
Original change's description:
> Use RasterPipeline to support full precision on 16-bit RGBA pngs
>
> TODO: Support more precision on 16-bit RGB pngs
>
> BUG=skia:
>
> CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
>
> Change-Id: I89dfef3b4887b9c4895c17309933883ab90ffa4d
> Reviewed-on: https://skia-review.googlesource.com/6260
> Reviewed-by: Mike Reed <reed@google.com>
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
TBR=mtklein@chromium.org,mtklein@google.com,msarett@google.com,scroggo@google.com,reed@google.com,reviews@skia.org
BUG=skia:
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I47579c20af033a75883e2b35567cb9c690ce54b0
Reviewed-on: https://skia-review.googlesource.com/6975
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/codec/SkSwizzler.cpp')
-rw-r--r-- | src/codec/SkSwizzler.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/codec/SkSwizzler.cpp b/src/codec/SkSwizzler.cpp index 9a339d4405..415f0f1ddc 100644 --- a/src/codec/SkSwizzler.cpp +++ b/src/codec/SkSwizzler.cpp @@ -51,16 +51,6 @@ static void sample4(void* dst, const uint8_t* src, int width, int bpp, int delta } } -static void sample8(void* dst, const uint8_t* src, int width, int bpp, int deltaSrc, int offset, - const SkPMColor ctable[]) { - src += offset; - uint64_t* dst64 = (uint64_t*) dst; - for (int x = 0; x < width; x++) { - dst64[x] = *((const uint64_t*) src); - src += deltaSrc; - } -} - // kBit // These routines exclusively choose between white and black @@ -818,9 +808,7 @@ SkSwizzler* SkSwizzler::CreateSwizzler(const SkEncodedInfo& encodedInfo, break; case kRGBA_8888_SkColorType: case kBGRA_8888_SkColorType: - SkASSERT(16 == encodedInfo.bitsPerComponent() || - 8 == encodedInfo.bitsPerComponent()); - proc = (8 == encodedInfo.bitsPerComponent()) ? &sample4 : &sample8; + proc = &sample4; fastProc = © break; default: |