AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missed a spot to clamp to gamut

Browse Source 
When folding a constant color pipeline through back to a single color,
we're not clamping that constant color back to gamut.

I noticed this when debugging plus mode, but it's really unrelated.

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ief43591373cfbb7e58d4178b0b6cc754fcf61c97
Reviewed-on: https://skia-review.googlesource.com/158540
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2018-10-01 15:23:41 -04:00 committed by Skia Commit-Bot
parent 21ba77273d
commit 0b170e81be
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/SkRasterPipelineBlitter.cpp
View File

@ -86,11 +86,7 @@ private:
typedef SkBlitter INHERITED;
};
static void append_color_pipeline(SkRasterPipeline* p,
const SkRasterPipeline& colorPipeline,
SkImageInfo dstInfo) {
p->extend(colorPipeline);
static void append_gamut_clamp(SkRasterPipeline* p, SkImageInfo dstInfo) {
// TODO: can we refine this condition further to avoid clamps when we're known in-gamut?
// When opaque we could _probably_ get away without a clamp, but for consistency we keep it.
if (dstInfo.colorType() != kRGBA_F16_SkColorType &&
@ -218,6 +214,7 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
if (is_constant) {
SkColor4f constantColor;
SkJumper_MemoryCtx constantColorPtr = { &constantColor, 0 };
append_gamut_clamp(colorPipeline, dst.info());
colorPipeline->append(SkRasterPipeline::store_f32, &constantColorPtr);
colorPipeline->run(0,0,1,1);
colorPipeline->reset();
@ -238,7 +235,8 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
// Run our color pipeline all the way through to produce what we'd memset when we can.
// Not all blits can memset, so we need to keep colorPipeline too.
SkRasterPipeline_<256> p;
append_color_pipeline(&p, *colorPipeline, dst.info());
p.extend(*colorPipeline);
append_gamut_clamp(&p, dst.info());
blitter->fDstPtr = SkJumper_MemoryCtx{&blitter->fMemsetColor, 0};
blitter->append_store(&p);
p.run(0,0,1,1);
@ -302,7 +300,8 @@ void SkRasterPipelineBlitter::blitRect(int x, int y, int w, int h) {
if (!fBlitRect) {
SkRasterPipeline p(fAlloc);
append_color_pipeline(&p, fColorPipeline, fDst.info());
p.extend(fColorPipeline);
append_gamut_clamp(&p, fDst.info());
if (fBlend == SkBlendMode::kSrcOver
&& (fDst.info().colorType() == kRGBA_8888_SkColorType ||
fDst.info().colorType() == kBGRA_8888_SkColorType)
@ -338,7 +337,8 @@ void SkRasterPipelineBlitter::blitRect(int x, int y, int w, int h) {
void SkRasterPipelineBlitter::blitAntiH(int x, int y, const SkAlpha aa[], const int16_t runs[]) {
if (!fBlitAntiH) {
SkRasterPipeline p(fAlloc);
append_color_pipeline(&p, fColorPipeline, fDst.info());
p.extend(fColorPipeline);
append_gamut_clamp(&p, fDst.info());
if (SkBlendMode_ShouldPreScaleCoverage(fBlend, /*rgb_coverage=*/false)) {
p.append(SkRasterPipeline::scale_1_float, &fCurrentCoverage);
this->append_load_dst(&p);
@ -422,7 +422,8 @@ void SkRasterPipelineBlitter::blitMask(const SkMask& mask, const SkIRect& clip)
// Lazily build whichever pipeline we need, specialized for each mask format.
if (effectiveMaskFormat == SkMask::kA8_Format && !fBlitMaskA8) {
SkRasterPipeline p(fAlloc);
append_color_pipeline(&p, fColorPipeline, fDst.info());
p.extend(fColorPipeline);
append_gamut_clamp(&p, fDst.info());
if (SkBlendMode_ShouldPreScaleCoverage(fBlend, /*rgb_coverage=*/false)) {
p.append(SkRasterPipeline::scale_u8, &fMaskPtr);
this->append_load_dst(&p);
@ -437,7 +438,8 @@ void SkRasterPipelineBlitter::blitMask(const SkMask& mask, const SkIRect& clip)
}
if (effectiveMaskFormat == SkMask::kLCD16_Format && !fBlitMaskLCD16) {
SkRasterPipeline p(fAlloc);
append_color_pipeline(&p, fColorPipeline, fDst.info());
p.extend(fColorPipeline);
append_gamut_clamp(&p, fDst.info());
if (SkBlendMode_ShouldPreScaleCoverage(fBlend, /*rgb_coverage=*/true)) {
// Somewhat unusually, scale_565 needs dst loaded first.
this->append_load_dst(&p);