From 2151353d161fe389cdc0db62cfe1932c7680f710 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 24 Mar 2015 03:50:22 -0700 Subject: [PATCH] remove colorfilter native-565 support. complicating w/ no real value. BUG=skia: TBR= Review URL: https://codereview.chromium.org/1015533011 --- include/core/SkColorFilter.h | 22 ++--------- include/effects/SkColorMatrixFilter.h | 2 - include/effects/SkModeColorFilter.h | 2 - src/core/SkColorFilter.cpp | 15 -------- src/core/SkFilterShader.cpp | 19 ++-------- src/core/SkFilterShader.h | 1 - src/effects/SkColorFilters.cpp | 54 +++++---------------------- src/effects/SkColorMatrixFilter.cpp | 39 +------------------ 8 files changed, 18 insertions(+), 136 deletions(-) diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index fe151a2533..ea314811ba 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -68,31 +68,15 @@ public: @param count the number of entries in the src[] and result[] arrays @param result written by the filter */ - virtual void filterSpan(const SkPMColor src[], int count, - SkPMColor result[]) const = 0; - /** Called with a scanline of colors, as if there was a shader installed. - The implementation writes out its filtered version into result[]. - Note: shader and result may be the same buffer. - @param src array of colors, possibly generated by a shader - @param count the number of entries in the src[] and result[] arrays - @param result written by the filter - */ - virtual void filterSpan16(const uint16_t shader[], int count, - uint16_t result[]) const; + virtual void filterSpan(const SkPMColor src[], int count, SkPMColor result[]) const = 0; enum Flags { - /** If set the filter methods will not change the alpha channel of the - colors. + /** If set the filter methods will not change the alpha channel of the colors. */ kAlphaUnchanged_Flag = 0x01, - /** If set, this subclass implements filterSpan16(). If this flag is - set, then kAlphaUnchanged_Flag must also be set. - */ - kHasFilter16_Flag = 0x02 }; - /** Returns the flags for this filter. Override in subclasses to return - custom flags. + /** Returns the flags for this filter. Override in subclasses to return custom flags. */ virtual uint32_t getFlags() const { return 0; } diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 58f37ffe4b..19033af3ec 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -20,9 +20,7 @@ public: return SkNEW_ARGS(SkColorMatrixFilter, (array)); } - // overrides from SkColorFilter void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; - void filterSpan16(const uint16_t src[], int count, uint16_t[]) const SK_OVERRIDE; uint32_t getFlags() const SK_OVERRIDE; bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE; SkColorFilter* newComposed(const SkColorFilter*) const SK_OVERRIDE; diff --git a/include/effects/SkModeColorFilter.h b/include/effects/SkModeColorFilter.h index 4bb7a43db4..6d0d3ccaa0 100644 --- a/include/effects/SkModeColorFilter.h +++ b/include/effects/SkModeColorFilter.h @@ -28,7 +28,6 @@ public: bool asColorMode(SkColor*, SkXfermode::Mode*) const SK_OVERRIDE; uint32_t getFlags() const SK_OVERRIDE; void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const SK_OVERRIDE; - void filterSpan16(const uint16_t shader[], int count, uint16_t result[]) const SK_OVERRIDE; #ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const SK_OVERRIDE { @@ -53,7 +52,6 @@ private: // cache SkPMColor fPMColor; SkXfermodeProc fProc; - SkXfermodeProc16 fProc16; void updateCache(); diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index 0a9cd93e34..45950ad0b5 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -22,15 +22,6 @@ bool SkColorFilter::asComponentTable(SkBitmap*) const { return false; } -void SkColorFilter::filterSpan16(const uint16_t s[], int count, uint16_t d[]) const { - SkASSERT(this->getFlags() & SkColorFilter::kHasFilter16_Flag); - SkDEBUGFAIL("missing implementation of SkColorFilter::filterSpan16"); - - if (d != s) { - memcpy(d, s, count * sizeof(uint16_t)); - } -} - SkColor SkColorFilter::filterColor(SkColor c) const { SkPMColor dst, src = SkPreMultiplyColor(c); this->filterSpan(&src, 1, &dst); @@ -61,12 +52,6 @@ public: fOuter->filterSpan(result, count, result); } - void filterSpan16(const uint16_t shader[], int count, uint16_t result[]) const SK_OVERRIDE { - SkASSERT(this->getFlags() & kHasFilter16_Flag); - fInner->filterSpan16(shader, count, result); - fOuter->filterSpan16(result, count, result); - } - #ifndef SK_IGNORE_TO_STRING void toString(SkString* str) const SK_OVERRIDE { SkString outerS, innerS; diff --git a/src/core/SkFilterShader.cpp b/src/core/SkFilterShader.cpp index 48c4b8b477..a10a7c9d77 100644 --- a/src/core/SkFilterShader.cpp +++ b/src/core/SkFilterShader.cpp @@ -46,13 +46,12 @@ uint32_t SkFilterShader::FilterShaderContext::getFlags() const { uint32_t shaderF = fShaderContext->getFlags(); uint32_t filterF = filterShader.fFilter->getFlags(); - // if the filter doesn't support 16bit, clear the matching bit in the shader - if (!(filterF & SkColorFilter::kHasFilter16_Flag)) { - shaderF &= ~SkShader::kHasSpan16_Flag; - } + // filters don't support 16bit, so clear the matching bit in the shader + shaderF &= ~SkShader::kHasSpan16_Flag; + // if the filter might change alpha, clear the opaque flag in the shader if (!(filterF & SkColorFilter::kAlphaUnchanged_Flag)) { - shaderF &= ~(SkShader::kOpaqueAlpha_Flag | SkShader::kHasSpan16_Flag); + shaderF &= ~SkShader::kOpaqueAlpha_Flag; } return shaderF; } @@ -87,16 +86,6 @@ void SkFilterShader::FilterShaderContext::shadeSpan(int x, int y, SkPMColor resu filterShader.fFilter->filterSpan(result, count, result); } -void SkFilterShader::FilterShaderContext::shadeSpan16(int x, int y, uint16_t result[], int count) { - const SkFilterShader& filterShader = static_cast(fShader); - - SkASSERT(fShaderContext->getFlags() & SkShader::kHasSpan16_Flag); - SkASSERT(filterShader.fFilter->getFlags() & SkColorFilter::kHasFilter16_Flag); - - fShaderContext->shadeSpan16(x, y, result, count); - filterShader.fFilter->filterSpan16(result, count, result); -} - #ifndef SK_IGNORE_TO_STRING void SkFilterShader::toString(SkString* str) const { str->append("SkFilterShader: ("); diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h index dca9567e66..65291c8f39 100644 --- a/src/core/SkFilterShader.h +++ b/src/core/SkFilterShader.h @@ -28,7 +28,6 @@ public: uint32_t getFlags() const SK_OVERRIDE; void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; void set3DMask(const SkMask* mask) SK_OVERRIDE { // forward to our proxy diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index 8bcd0ebc5d..8c021e452b 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -27,7 +27,14 @@ bool SkModeColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) cons } uint32_t SkModeColorFilter::getFlags() const { - return fProc16 ? (kAlphaUnchanged_Flag | kHasFilter16_Flag) : 0; + switch (fMode) { + case SkXfermode::kDst_Mode: //!< [Da, Dc] + case SkXfermode::kSrcATop_Mode: //!< [Da, Sc * Da + (1 - Sa) * Dc] + return kAlphaUnchanged_Flag; + default: + break; + } + return 0; } void SkModeColorFilter::filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const { @@ -39,16 +46,6 @@ void SkModeColorFilter::filterSpan(const SkPMColor shader[], int count, SkPMColo } } -void SkModeColorFilter::filterSpan16(const uint16_t shader[], int count, uint16_t result[]) const { - SkASSERT(this->getFlags() & kHasFilter16_Flag); - - SkPMColor color = fPMColor; - SkXfermodeProc16 proc16 = fProc16; - - for (int i = 0; i < count; i++) { - result[i] = proc16(color, shader[i]); - } -} void SkModeColorFilter::flatten(SkWriteBuffer& buffer) const { buffer.writeColor(fColor); buffer.writeUInt(fMode); @@ -57,7 +54,6 @@ void SkModeColorFilter::flatten(SkWriteBuffer& buffer) const { void SkModeColorFilter::updateCache() { fPMColor = SkPreMultiplyColor(fColor); fProc = SkXfermode::GetProc(fMode); - fProc16 = SkXfermode::GetProc16(fMode, fColor); } SkFlattenable* SkModeColorFilter::CreateProc(SkReadBuffer& buffer) { @@ -388,25 +384,10 @@ class Src_SkModeColorFilter : public SkModeColorFilter { public: Src_SkModeColorFilter(SkColor color) : INHERITED(color, SkXfermode::kSrc_Mode) {} - uint32_t getFlags() const SK_OVERRIDE { - if (SkGetPackedA32(this->getPMColor()) == 0xFF) { - return kAlphaUnchanged_Flag | kHasFilter16_Flag; - } else { - return 0; - } - } - - virtual void filterSpan(const SkPMColor shader[], int count, - SkPMColor result[]) const SK_OVERRIDE { + void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const SK_OVERRIDE { sk_memset32(result, this->getPMColor(), count); } - virtual void filterSpan16(const uint16_t shader[], int count, - uint16_t result[]) const SK_OVERRIDE { - SkASSERT(this->getFlags() & kHasFilter16_Flag); - sk_memset16(result, SkPixel32ToPixel16(this->getPMColor()), count); - } - private: typedef SkModeColorFilter INHERITED; }; @@ -418,25 +399,10 @@ public: fColor32Proc = SkBlitRow::ColorProcFactory(); } - uint32_t getFlags() const SK_OVERRIDE { - if (SkGetPackedA32(this->getPMColor()) == 0xFF) { - return kAlphaUnchanged_Flag | kHasFilter16_Flag; - } else { - return 0; - } - } - - virtual void filterSpan(const SkPMColor shader[], int count, - SkPMColor result[]) const SK_OVERRIDE { + void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const SK_OVERRIDE { fColor32Proc(result, shader, count, this->getPMColor()); } - virtual void filterSpan16(const uint16_t shader[], int count, - uint16_t result[]) const SK_OVERRIDE { - SkASSERT(this->getFlags() & kHasFilter16_Flag); - sk_memset16(result, SkPixel32ToPixel16(this->getPMColor()), count); - } - private: SkBlitRow::ColorProc fColor32Proc; diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index bb3b6dda78..9cd904fd63 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -117,9 +117,6 @@ static void Add16(const SkColorMatrixFilter::State& state, result[3] = a; } -#define kNO_ALPHA_FLAGS (SkColorFilter::kAlphaUnchanged_Flag | \ - SkColorFilter::kHasFilter16_Flag) - // src is [20] but some compilers won't accept __restrict__ on anything // but an raw pointer or reference void SkColorMatrixFilter::initState(const SkScalar* SK_RESTRICT src) { @@ -159,7 +156,7 @@ void SkColorMatrixFilter::initState(const SkScalar* SK_RESTRICT src) { fProc = shiftIs16 ? General16 : General; fFlags = changesAlpha ? 0 : SkColorFilter::kAlphaUnchanged_Flag; } else { - fFlags = kNO_ALPHA_FLAGS; + fFlags = SkColorFilter::kAlphaUnchanged_Flag; int32_t needsScale = (array[SkColorMatrix::kR_Scale] - one) | (array[SkColorMatrix::kG_Scale] - one) | @@ -266,40 +263,6 @@ void SkColorMatrixFilter::filterSpan(const SkPMColor src[], int count, } } -void SkColorMatrixFilter::filterSpan16(const uint16_t src[], int count, - uint16_t dst[]) const { - SkASSERT(fFlags & SkColorFilter::kHasFilter16_Flag); - - Proc proc = fProc; - const State& state = fState; - int32_t result[4]; - - if (NULL == proc) { - if (src != dst) { - memcpy(dst, src, count * sizeof(uint16_t)); - } - return; - } - - for (int i = 0; i < count; i++) { - uint16_t c = src[i]; - - // expand to 8bit components (since our matrix translate is 8bit biased - unsigned r = SkPacked16ToR32(c); - unsigned g = SkPacked16ToG32(c); - unsigned b = SkPacked16ToB32(c); - - proc(state, r, g, b, 0, result); - - r = pin(result[0], SK_R32_MASK); - g = pin(result[1], SK_G32_MASK); - b = pin(result[2], SK_B32_MASK); - - // now packed it back down to 16bits (hmmm, could dither...) - dst[i] = SkPack888ToRGB16(r, g, b); - } -} - /////////////////////////////////////////////////////////////////////////////// void SkColorMatrixFilter::flatten(SkWriteBuffer& buffer) const { -- 2.34.1