diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-05-19 19:15:55 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-23 19:45:46 +0000 |
| commit | 6ebba9f5b26d556b0a22131749da680716059702 (patch) | |
| tree | 049ac06bee4a1863dc863bb90c5b38b3b7c59f34 | |
| parent | a9e795eab5f59a52d96b8fdc39351452835f5eb9 (diff) | |
Dither copies when decreasing precision below 32-bit.
Same GM diffs as the last attempt in 8888.
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android,Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release,Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android
BUG=chromium:720105
Still looking at why readpixels and readpixelspicture are so weird
(lots of black) when drawing into sRGB 8888. Will follow up.
Change-Id: I223e3b74e567aea1acaffa8db6b24fbf22d98c97
Reviewed-on: https://skia-review.googlesource.com/17443
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
| -rw-r--r-- | src/core/SkConvertPixels.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/core/SkConvertPixels.cpp b/src/core/SkConvertPixels.cpp index 99564e7222..cc2b953a45 100644 --- a/src/core/SkConvertPixels.cpp +++ b/src/core/SkConvertPixels.cpp @@ -16,6 +16,7 @@ #include "SkRasterPipeline.h" #include "SkUnPreMultiply.h" #include "SkUnPreMultiplyPriv.h" +#include "../jumper/SkJumper.h" // Fast Path 1: The memcpy() case. static inline bool can_memcpy(const SkImageInfo& dstInfo, const SkImageInfo& srcInfo) { @@ -357,6 +358,20 @@ static void convert_with_pipeline(const SkImageInfo& dstInfo, void* dstRow, size // opaque to another alpha type, there's no need to worry about multiplication. SkASSERT(premulState == dat || kOpaque_SkAlphaType == srcInfo.alphaType()); + // We'll dither if we're decreasing precision below 32-bit. + int y; + SkJumper_DitherCtx dither = {&y, 0.0f}; + if (srcInfo.bytesPerPixel() > dstInfo.bytesPerPixel()) { + switch (dstInfo.colorType()) { + case kRGB_565_SkColorType: dither.rate = 1/63.0f; break; + case kARGB_4444_SkColorType: dither.rate = 1/15.0f; break; + default: dither.rate = 0.0f; break; + } + } + if (dither.rate > 0) { + pipeline.append(SkRasterPipeline::dither, &dither); + } + switch (dstInfo.colorType()) { case kRGBA_8888_SkColorType: pipeline.append(SkRasterPipeline::store_8888, &dstRow); @@ -379,7 +394,8 @@ static void convert_with_pipeline(const SkImageInfo& dstInfo, void* dstRow, size break; } - for (int y = 0; y < srcInfo.height(); ++y) { + // This y is declared above when handling dither (which needs to know y). + for (y = 0; y < srcInfo.height(); ++y) { pipeline.run(0,srcInfo.width()); // The pipeline has pointers to srcRow and dstRow, so we just need to update them in the // loop to move between rows of src/dst. |