remove unused blitrow
Bug: skia:
Change-Id: Id905a4b9246a986a3c5de05042e32930d881c1ed
Reviewed-on: https://skia-review.googlesource.com/20772
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/gn/core.gni b/gn/core.gni
index 41adf71..7a43a69 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -53,7 +53,6 @@
"$_src/core/SkBlitMask.h",
"$_src/core/SkBlitMask_D32.cpp",
"$_src/core/SkBlitRow.h",
- "$_src/core/SkBlitRow_D16.cpp",
"$_src/core/SkBlitRow_D32.cpp",
"$_src/core/SkBlitter.h",
"$_src/core/SkBlitter.cpp",
diff --git a/src/core/SkBlitRow.h b/src/core/SkBlitRow.h
index 35f0a0a..d35f1c4 100644
--- a/src/core/SkBlitRow.h
+++ b/src/core/SkBlitRow.h
@@ -13,42 +13,6 @@
class SkBlitRow {
public:
- enum Flags16 {
- //! If set, the alpha parameter will be != 255
- kGlobalAlpha_Flag = 0x01,
- //! If set, the src colors may have alpha != 255
- kSrcPixelAlpha_Flag = 0x02,
- //! If set, the resulting 16bit colors should be dithered
- kDither_Flag = 0x04
- };
-
- /** Function pointer that reads a scanline of src SkPMColors, and writes
- a corresponding scanline of 16bit colors (specific format based on the
- config passed to the Factory.
-
- The x,y params provide the dithering phase for the start of the scanline
-
- @param alpha A global alpha to be applied to all of the src colors
- @param x The x coordinate of the beginning of the scanline
- @param y THe y coordinate of the scanline
- */
- typedef void (*Proc16)(uint16_t dst[], const SkPMColor src[], int count,
- U8CPU alpha, int x, int y);
-
- static Proc16 Factory16(unsigned flags);
-
- /**
- * Function pointer that blends a single src color onto a scaline of dst colors.
- *
- * The x,y params provide the dithering phase for the start of the scanline
- */
- typedef void (*ColorProc16)(uint16_t dst[], SkPMColor src, int count, int x, int y);
-
- // Note : we ignore the kGlobalAlpha_Flag setting, but do respect kSrcPixelAlpha_Flag
- static ColorProc16 ColorFactory16(unsigned flags);
-
- ///////////// D32 version
-
enum Flags32 {
kGlobalAlpha_Flag32 = 1 << 0,
kSrcPixelAlpha_Flag32 = 1 << 1
@@ -80,7 +44,6 @@
private:
enum {
- kFlags16_Mask = 7,
kFlags32_Mask = 3
};
};
diff --git a/src/core/SkBlitRow_D16.cpp b/src/core/SkBlitRow_D16.cpp
deleted file mode 100644
index 3c5aba5..0000000
--- a/src/core/SkBlitRow_D16.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBlitRow.h"
-#include "SkColorPriv.h"
-#include "SkDither.h"
-#include "SkMathPriv.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-static void S32_D565_Opaque(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src, int count,
- U8CPU alpha, int /*x*/, int /*y*/) {
- SkASSERT(255 == alpha);
-
- if (count > 0) {
- do {
- SkPMColor c = *src++;
- SkPMColorAssert(c);
- *dst++ = SkPixel32ToPixel16_ToU16(c);
- } while (--count != 0);
- }
-}
-
-static void S32_D565_Blend(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src, int count,
- U8CPU alpha, int /*x*/, int /*y*/) {
- SkASSERT(255 > alpha);
-
- if (count > 0) {
- int scale = SkAlpha255To256(alpha);
- do {
- SkPMColor c = *src++;
- SkPMColorAssert(c);
- uint16_t d = *dst;
- *dst++ = SkPackRGB16(
- SkAlphaBlend(SkPacked32ToR16(c), SkGetPackedR16(d), scale),
- SkAlphaBlend(SkPacked32ToG16(c), SkGetPackedG16(d), scale),
- SkAlphaBlend(SkPacked32ToB16(c), SkGetPackedB16(d), scale));
- } while (--count != 0);
- }
-}
-
-static void S32A_D565_Opaque(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src, int count,
- U8CPU alpha, int /*x*/, int /*y*/) {
- SkASSERT(255 == alpha);
-
- if (count > 0) {
- do {
- SkPMColor c = *src++;
- SkPMColorAssert(c);
-// if (__builtin_expect(c!=0, 1))
- if (c) {
- *dst = SkSrcOver32To16(c, *dst);
- }
- dst += 1;
- } while (--count != 0);
- }
-}
-
-static void S32A_D565_Blend(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src, int count,
- U8CPU alpha, int /*x*/, int /*y*/) {
- SkASSERT(255 > alpha);
-
- if (count > 0) {
- do {
- SkPMColor sc = *src++;
- SkPMColorAssert(sc);
- if (sc) {
- uint16_t dc = *dst;
- SkPMColor res = SkBlendARGB32(sc, SkPixel16ToPixel32(dc), alpha);
- *dst = SkPixel32ToPixel16(res);
- }
- dst += 1;
- } while (--count != 0);
- }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-static void S32_D565_Opaque_Dither(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src,
- int count, U8CPU alpha, int x, int y) {
- SkASSERT(255 == alpha);
-
- if (count > 0) {
- DITHER_565_SCAN(y);
- do {
- SkPMColor c = *src++;
- SkPMColorAssert(c);
-
- unsigned dither = DITHER_VALUE(x);
- *dst++ = SkDitherRGB32To565(c, dither);
- DITHER_INC_X(x);
- } while (--count != 0);
- }
-}
-
-static void S32_D565_Blend_Dither(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src,
- int count, U8CPU alpha, int x, int y) {
- SkASSERT(255 > alpha);
-
- if (count > 0) {
- int scale = SkAlpha255To256(alpha);
- DITHER_565_SCAN(y);
- do {
- SkPMColor c = *src++;
- SkPMColorAssert(c);
-
- int dither = DITHER_VALUE(x);
- int sr = SkGetPackedR32(c);
- int sg = SkGetPackedG32(c);
- int sb = SkGetPackedB32(c);
- sr = SkDITHER_R32To565(sr, dither);
- sg = SkDITHER_G32To565(sg, dither);
- sb = SkDITHER_B32To565(sb, dither);
-
- uint16_t d = *dst;
- *dst++ = SkPackRGB16(SkAlphaBlend(sr, SkGetPackedR16(d), scale),
- SkAlphaBlend(sg, SkGetPackedG16(d), scale),
- SkAlphaBlend(sb, SkGetPackedB16(d), scale));
- DITHER_INC_X(x);
- } while (--count != 0);
- }
-}
-
-static void S32A_D565_Opaque_Dither(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src,
- int count, U8CPU alpha, int x, int y) {
- SkASSERT(255 == alpha);
-
- if (count > 0) {
- DITHER_565_SCAN(y);
- do {
- SkPMColor c = *src++;
- SkPMColorAssert(c);
- if (c) {
- unsigned a = SkGetPackedA32(c);
-
- int d = SkAlphaMul(DITHER_VALUE(x), SkAlpha255To256(a));
-
- unsigned sr = SkGetPackedR32(c);
- unsigned sg = SkGetPackedG32(c);
- unsigned sb = SkGetPackedB32(c);
- sr = SkDITHER_R32_FOR_565(sr, d);
- sg = SkDITHER_G32_FOR_565(sg, d);
- sb = SkDITHER_B32_FOR_565(sb, d);
-
- uint32_t src_expanded = (sg << 24) | (sr << 13) | (sb << 2);
- uint32_t dst_expanded = SkExpand_rgb_16(*dst);
- dst_expanded = dst_expanded * (SkAlpha255To256(255 - a) >> 3);
- // now src and dst expanded are in g:11 r:10 x:1 b:10
- *dst = SkCompact_rgb_16((src_expanded + dst_expanded) >> 5);
- }
- dst += 1;
- DITHER_INC_X(x);
- } while (--count != 0);
- }
-}
-
-static void S32A_D565_Blend_Dither(uint16_t* SK_RESTRICT dst,
- const SkPMColor* SK_RESTRICT src,
- int count, U8CPU alpha, int x, int y) {
- SkASSERT(255 > alpha);
-
- if (count > 0) {
- int src_scale = SkAlpha255To256(alpha);
- DITHER_565_SCAN(y);
- do {
- SkPMColor c = *src++;
- SkPMColorAssert(c);
- if (c)
- {
- unsigned d = *dst;
- int sa = SkGetPackedA32(c);
- int dst_scale = SkAlphaMulInv256(sa, src_scale);
- int dither = DITHER_VALUE(x);
-
- int sr = SkGetPackedR32(c);
- int sg = SkGetPackedG32(c);
- int sb = SkGetPackedB32(c);
- sr = SkDITHER_R32To565(sr, dither);
- sg = SkDITHER_G32To565(sg, dither);
- sb = SkDITHER_B32To565(sb, dither);
-
- int dr = (sr * src_scale + SkGetPackedR16(d) * dst_scale) >> 8;
- int dg = (sg * src_scale + SkGetPackedG16(d) * dst_scale) >> 8;
- int db = (sb * src_scale + SkGetPackedB16(d) * dst_scale) >> 8;
-
- *dst = SkPackRGB16(dr, dg, db);
- }
- dst += 1;
- DITHER_INC_X(x);
- } while (--count != 0);
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-static uint32_t pmcolor_to_expand16(SkPMColor c) {
- unsigned r = SkGetPackedR32(c);
- unsigned g = SkGetPackedG32(c);
- unsigned b = SkGetPackedB32(c);
- return (g << 24) | (r << 13) | (b << 2);
-}
-
-static void Color32A_D565(uint16_t dst[], SkPMColor src, int count, int x, int y) {
- SkASSERT(count > 0);
- uint32_t src_expand = pmcolor_to_expand16(src);
- unsigned scale = SkAlpha255To256(0xFF - SkGetPackedA32(src)) >> 3;
- do {
- *dst = SkBlend32_RGB16(src_expand, *dst, scale);
- dst += 1;
- } while (--count != 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-static const SkBlitRow::Proc16 gDefault_565_Procs[] = {
- // no dither
- S32_D565_Opaque,
- S32_D565_Blend,
-
- S32A_D565_Opaque,
- S32A_D565_Blend,
-
- // dither
- S32_D565_Opaque_Dither,
- S32_D565_Blend_Dither,
-
- S32A_D565_Opaque_Dither,
- S32A_D565_Blend_Dither
-};
-
-SkBlitRow::Proc16 SkBlitRow::Factory16(unsigned flags) {
- SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_Procs));
- // just so we don't crash
- flags &= kFlags16_Mask;
-
- return gDefault_565_Procs[flags];
-}
-
-static const SkBlitRow::ColorProc16 gDefault_565_ColorProcs[] = {
-#if 0
- Color32A_D565,
- Color32A_D565_Dither
-#else
- // TODO: stop cheating and fill dither from the above specializations!
- Color32A_D565,
- Color32A_D565,
-#endif
-};
-
-SkBlitRow::ColorProc16 SkBlitRow::ColorFactory16(unsigned flags) {
- SkASSERT((flags & ~kFlags16_Mask) == 0);
- // just so we don't crash
- flags &= kFlags16_Mask;
- // we ignore both kGlobalAlpha_Flag and kSrcPixelAlpha_Flag, so shift down
- // no need for the additional code specializing on opaque alpha at this time
- flags >>= 2;
-
- SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_ColorProcs));
-
- return gDefault_565_ColorProcs[flags];
-}
