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

Fix SkModeColorFilter in 565

Browse Source 
It has been incorrectly interpreting its SkColor as sRGB all the time.  Now, we plumb through the destintation color space and some scratch space, letting it decide how to interpret its SkColor later when it knows about the dst color space.  The scratch space is blitter scoped, which lets this be thread safe (this is much like SkShader::Context).

This only corrects the gamma transformation for now.  I've kept my previous TODO about gamut transformation.  Everything assumes sRGB gamut for now.

Shaders will get the same treatement in this pipeline.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4725

Change-Id: I55b0c7d5db9ad8d7dcdd6295c9dac61d10aeaed4
Reviewed-on: https://skia-review.googlesource.com/4725
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2016-11-11 12:51:36 -05:00 committed by Skia Commit-Bot
parent 83b5b21714
commit 744908e5e8
12 changed files with 68 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/core/SkColorFilter.h
View File

@ -17,6 +17,7 @@ class GrContext;
class GrFragmentProcessor;
class SkBitmap;
class SkColorSpace;
class SkFallbackAlloc;
class SkRasterPipeline;
/**
@ -72,7 +73,8 @@ public:
virtual void filterSpan4f(const SkPM4f src[], int count, SkPM4f result[]) const;
bool appendStages(SkRasterPipeline*, bool shaderIsOpaque) const;
bool appendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*,
bool shaderIsOpaque) const;
enum Flags {
/** If set the filter methods will not change the alpha channel of the colors.
@ -158,7 +160,8 @@ public:
protected:
SkColorFilter() {}
virtual bool onAppendStages(SkRasterPipeline*, bool shaderIsOpaque) const;
virtual bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*,
bool shaderIsOpaque) const;
private:
/*

1
include/core/SkPixmap.h
View File

@ -70,6 +70,7 @@ public:
int height() const { return fInfo.height(); }
SkColorType colorType() const { return fInfo.colorType(); }
SkAlphaType alphaType() const { return fInfo.alphaType(); }
SkColorSpace* colorSpace() const { return fInfo.colorSpace(); }
bool isOpaque() const { return fInfo.isOpaque(); }
SkIRect bounds() const { return SkIRect::MakeWH(this->width(), this->height()); }

3
include/effects/SkLumaColorFilter.h
View File

@ -42,7 +42,8 @@ protected:
private:
SkLumaColorFilter();
bool onAppendStages(SkRasterPipeline*, bool shaderIsOpaque) const override;
bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*,
bool shaderIsOpaque) const override;
typedef SkColorFilter INHERITED;
};

10
src/core/SkColorFilter.cpp
View File

@ -6,6 +6,7 @@
*/
#include "SkColorFilter.h"
#include "SkFixedAlloc.h"
#include "SkReadBuffer.h"
#include "SkRefCnt.h"
#include "SkString.h"
@ -37,11 +38,14 @@ sk_sp<GrFragmentProcessor> SkColorFilter::asFragmentProcessor(GrContext*, SkColo
}
#endif
bool SkColorFilter::appendStages(SkRasterPipeline* pipeline, bool shaderIsOpaque) const {
return this->onAppendStages(pipeline, shaderIsOpaque);
bool SkColorFilter::appendStages(SkRasterPipeline* pipeline,
SkColorSpace* dst,
SkFallbackAlloc* scratch,
bool shaderIsOpaque) const {
return this->onAppendStages(pipeline, dst, scratch, shaderIsOpaque);
}
bool SkColorFilter::onAppendStages(SkRasterPipeline*, bool shaderIsOpaque) const {
bool SkColorFilter::onAppendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*, bool) const {
return false;
}

2
src/core/SkColorMatrixFilterRowMajor255.cpp
View File

@ -232,6 +232,8 @@ static void set_concat(SkScalar result[20], const SkScalar outer[20], const SkSc
//////
bool SkColorMatrixFilterRowMajor255::onAppendStages(SkRasterPipeline* p,
SkColorSpace* dst,
SkFallbackAlloc* scratch,
bool shaderIsOpaque) const {
bool willStayOpaque = shaderIsOpaque && (fFlags & kAlphaUnchanged_Flag);
bool needsClamp0 = false,

3
src/core/SkColorMatrixFilterRowMajor255.h
View File

@ -36,7 +36,8 @@ protected:
void flatten(SkWriteBuffer&) const override;
private:
bool onAppendStages(SkRasterPipeline*, bool shaderIsOpaque) const override;
bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*,
bool shaderIsOpaque) const override;
SkScalar fMatrix[20];
float fTranspose[20]; // for Sk4s

4
src/core/SkFixedAlloc.h
View File

@ -37,7 +37,7 @@ public:
// Create the T.
auto ptr = (T*)(fBuffer+fUsed);
new (ptr) T{std::forward<Args>(args)...};
new (ptr) T(std::forward<Args>(args)...);
fUsed += sizeof(T);
// Stamp a footer after the T that we can use to clean it up.
@ -78,7 +78,7 @@ public:
return ptr;
}
}
auto ptr = new T{std::forward<Args>(args)...};
auto ptr = new T(std::forward<Args>(args)...);
fHeapAllocs.push_back({[](void* ptr) { delete (T*)ptr; }, ptr});
return ptr;
}

18
src/core/SkModeColorFilter.cpp
View File

@ -9,7 +9,9 @@
#include "SkBlendModePriv.h"
#include "SkColorFilter.h"
#include "SkColorPriv.h"
#include "SkFixedAlloc.h"
#include "SkModeColorFilter.h"
#include "SkPM4fPriv.h"
#include "SkRasterPipeline.h"
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
@ -62,9 +64,9 @@ void SkModeColorFilter::filterSpan(const SkPMColor shader[], int count, SkPMColo
void SkModeColorFilter::filterSpan4f(const SkPM4f shader[], int count, SkPM4f result[]) const {
SkXfermodeProc4f proc = SkXfermode::GetProc4f(fMode);
auto pm4f = SkColor4f::FromColor(fColor).premul();
for (int i = 0; i < count; i++) {
result[i] = proc(fPM4f, shader[i]);
result[i] = proc(pm4f, shader[i]);
}
}
@ -76,7 +78,6 @@ void SkModeColorFilter::flatten(SkWriteBuffer& buffer) const {
void SkModeColorFilter::updateCache() {
fPMColor = SkPreMultiplyColor(fColor);
fProc = SkXfermode::GetProc(fMode);
fPM4f = SkColor4f::FromColor(fColor).premul();
}
sk_sp<SkFlattenable> SkModeColorFilter::CreateProc(SkReadBuffer& buffer) {
@ -85,11 +86,14 @@ sk_sp<SkFlattenable> SkModeColorFilter::CreateProc(SkReadBuffer& buffer) {
return SkColorFilter::MakeModeFilter(color, mode);
}
bool SkModeColorFilter::onAppendStages(SkRasterPipeline* p, bool shaderIsOpaque) const {
// TODO: For some modes we can cut a stage by loading the fPM4f into dr,dg,db,da
// and applying the opposite xfermode, e.g. dst-in instead of src-in.
bool SkModeColorFilter::onAppendStages(SkRasterPipeline* p,
SkColorSpace* dst,
SkFallbackAlloc* scratch,
bool shaderIsOpaque) const {
auto color = scratch->make<SkPM4f>(SkPM4f_from_SkColor(fColor, dst));
p->append(SkRasterPipeline::move_src_dst);
p->append(SkRasterPipeline::constant_color, &fPM4f);
p->append(SkRasterPipeline::constant_color, color);
auto mode = (SkBlendMode)fMode;
if (!SkBlendMode_AppendStages(mode, p)) {
return false;

4
src/core/SkModeColorFilter.h
View File

@ -45,7 +45,8 @@ protected:
void flatten(SkWriteBuffer&) const override;
bool onAppendStages(SkRasterPipeline*, bool shaderIsOpaque) const override;
bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*,
bool shaderIsOpaque) const override;
private:
SkColor fColor;
@ -53,7 +54,6 @@ private:
// cache
SkPMColor fPMColor;
SkXfermodeProc fProc;
SkPM4f fPM4f;
void updateCache();

14
src/core/SkPM4fPriv.h
View File

@ -9,6 +9,7 @@
#define SkPM4fPriv_DEFINED
#include "SkColorPriv.h"
#include "SkColorSpace.h"
#include "SkPM4f.h"
#include "SkSRGB.h"
@ -71,4 +72,17 @@ static inline float exact_srgb_to_linear(float srgb) {
return linear;
}
static inline SkPM4f SkPM4f_from_SkColor(SkColor color, SkColorSpace* dst) {
SkColor4f color4f;
if (dst) {
// sRGB gamma, sRGB gamut.
color4f = SkColor4f::FromColor(color);
// TODO: gamut transform if needed
} else {
// Linear gamma, dst gamut.
swizzle_rb(SkNx_cast<float>(Sk4b::Load(&color)) * (1/255.0f)).store(&color4f);
}
return color4f.premul();
}
#endif

37
src/core/SkRasterPipelineBlitter.cpp
View File

@ -9,8 +9,10 @@
#include "SkBlendModePriv.h"
#include "SkColor.h"
#include "SkColorFilter.h"
#include "SkFixedAlloc.h"
#include "SkOpts.h"
#include "SkPM4f.h"
#include "SkPM4fPriv.h"
#include "SkRasterPipeline.h"
#include "SkShader.h"
#include "SkXfermode.h"
@ -24,6 +26,8 @@ public:
: fDst(dst)
, fBlend(blend)
, fPaintColor(paintColor)
, fScratchAlloc(fScratch, sizeof(fScratch))
, fScratchFallback(&fScratchAlloc)
{}
void blitH (int x, int y, int w) override;
@ -57,6 +61,11 @@ private:
const void* fMaskPtr = nullptr;
float fConstantCoverage = 0.0f;
// Scratch space for shaders and color filters to use.
char fScratch[64];
SkFixedAlloc fScratchAlloc;
SkFallbackAlloc fScratchFallback;
typedef SkBlitter INHERITED;
};
@ -75,29 +84,14 @@ static bool supported(const SkImageInfo& info) {
}
}
template <typename Effect>
static bool append_effect_stages(const Effect* effect, SkRasterPipeline* pipeline) {
return !effect || effect->appendStages(pipeline);
}
static SkPM4f paint_color(const SkPixmap& dst, const SkPaint& paint) {
auto paintColor = paint.getColor();
SkColor4f color;
if (dst.info().colorSpace()) {
color = SkColor4f::FromColor(paintColor);
// TODO: transform from sRGB to dst gamut.
} else {
swizzle_rb(SkNx_cast<float>(Sk4b::Load(&paintColor)) * (1/255.0f)).store(&color);
}
return color.premul();
}
SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
const SkPaint& paint,
SkTBlitterAllocator* alloc) {
auto blitter = alloc->createT<SkRasterPipelineBlitter>(dst,
paint.getBlendMode(),
paint_color(dst, paint));
auto blitter = alloc->createT<SkRasterPipelineBlitter>(
dst,
paint.getBlendMode(),
SkPM4f_from_SkColor(paint.getColor(), dst.colorSpace()));
auto earlyOut = [&] {
blitter->~SkRasterPipelineBlitter();
alloc->freeLast();
@ -128,7 +122,8 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
}
if (colorFilter) {
if (!colorFilter->appendStages(pipeline, is_opaque)) {
if (!colorFilter->appendStages(pipeline, dst.colorSpace(), &blitter->fScratchFallback,
is_opaque)) {
return earlyOut();
}
is_opaque = is_opaque && (colorFilter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag);

5
src/effects/SkLumaColorFilter.cpp
View File

@ -38,7 +38,10 @@ void SkLumaColorFilter::filterSpan(const SkPMColor src[], int count,
}
}
bool SkLumaColorFilter::onAppendStages(SkRasterPipeline* p, bool shaderIsOpaque) const {
bool SkLumaColorFilter::onAppendStages(SkRasterPipeline* p,
SkColorSpace* dst,
SkFallbackAlloc* scratch,
bool shaderIsOpaque) const {
p->append(SkRasterPipeline::luminance_to_alpha);
return true;
}