diff options
author | Florin Malita <fmalita@chromium.org> | 2018-04-16 15:29:44 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-16 20:18:00 +0000 |
commit | cbcf4743db911f6998407576f8264eab1b596839 (patch) | |
tree | 10edd072084b9be8c3a3a1070cdc6a040d01f9b7 /src/core/SkBlitMask_D32.cpp | |
parent | 1b6eb9900dcafba26bd942082f16a7956aa33eec (diff) |
Remove unused BW mask blitters
Change-Id: I59593e84945633f505d034bea01f6d0b51c5b837
Reviewed-on: https://skia-review.googlesource.com/121663
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkBlitMask_D32.cpp')
-rw-r--r-- | src/core/SkBlitMask_D32.cpp | 74 |
1 files changed, 6 insertions, 68 deletions
diff --git a/src/core/SkBlitMask_D32.cpp b/src/core/SkBlitMask_D32.cpp index c30fb1d435..1759ed6a33 100644 --- a/src/core/SkBlitMask_D32.cpp +++ b/src/core/SkBlitMask_D32.cpp @@ -75,65 +75,6 @@ bool SkBlitMask::BlitColor(const SkPixmap& device, const SkMask& mask, /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// - -static void BW_RowProc_Blend( - SkPMColor* SK_RESTRICT dst, const void* maskIn, const SkPMColor* SK_RESTRICT src, int count) { - const uint8_t* SK_RESTRICT mask = static_cast<const uint8_t*>(maskIn); - int i, octuple = (count + 7) >> 3; - for (i = 0; i < octuple; ++i) { - int m = *mask++; - if (m & 0x80) { dst[0] = SkPMSrcOver(src[0], dst[0]); } - if (m & 0x40) { dst[1] = SkPMSrcOver(src[1], dst[1]); } - if (m & 0x20) { dst[2] = SkPMSrcOver(src[2], dst[2]); } - if (m & 0x10) { dst[3] = SkPMSrcOver(src[3], dst[3]); } - if (m & 0x08) { dst[4] = SkPMSrcOver(src[4], dst[4]); } - if (m & 0x04) { dst[5] = SkPMSrcOver(src[5], dst[5]); } - if (m & 0x02) { dst[6] = SkPMSrcOver(src[6], dst[6]); } - if (m & 0x01) { dst[7] = SkPMSrcOver(src[7], dst[7]); } - src += 8; - dst += 8; - } - count &= 7; - if (count > 0) { - int m = *mask; - do { - if (m & 0x80) { dst[0] = SkPMSrcOver(src[0], dst[0]); } - m <<= 1; - src += 1; - dst += 1; - } while (--count > 0); - } -} - -static void BW_RowProc_Opaque( - SkPMColor* SK_RESTRICT dst, const void* maskIn, const SkPMColor* SK_RESTRICT src, int count) { - const uint8_t* SK_RESTRICT mask = static_cast<const uint8_t*>(maskIn); - int i, octuple = (count + 7) >> 3; - for (i = 0; i < octuple; ++i) { - int m = *mask++; - if (m & 0x80) { dst[0] = src[0]; } - if (m & 0x40) { dst[1] = src[1]; } - if (m & 0x20) { dst[2] = src[2]; } - if (m & 0x10) { dst[3] = src[3]; } - if (m & 0x08) { dst[4] = src[4]; } - if (m & 0x04) { dst[5] = src[5]; } - if (m & 0x02) { dst[6] = src[6]; } - if (m & 0x01) { dst[7] = src[7]; } - src += 8; - dst += 8; - } - count &= 7; - if (count > 0) { - int m = *mask; - do { - if (m & 0x80) { dst[0] = SkPMSrcOver(src[0], dst[0]); } - m <<= 1; - src += 1; - dst += 1; - } while (--count > 0); - } -} - static void A8_RowProc_Blend( SkPMColor* SK_RESTRICT dst, const void* maskIn, const SkPMColor* SK_RESTRICT src, int count) { const uint8_t* SK_RESTRICT mask = static_cast<const uint8_t*>(maskIn); @@ -282,28 +223,25 @@ SkBlitMask::RowProc SkBlitMask::RowFactory(SkColorType ct, } static const RowProc gProcs[] = { - // need X coordinate to handle BW - false ? (RowProc)BW_RowProc_Blend : nullptr, // suppress unused warning - false ? (RowProc)BW_RowProc_Opaque : nullptr, // suppress unused warning (RowProc)A8_RowProc_Blend, (RowProc)A8_RowProc_Opaque, (RowProc)LCD16_RowProc_Blend, (RowProc)LCD16_RowProc_Opaque, }; - int index; switch (ct) { - case kN32_SkColorType: + case kN32_SkColorType: { + size_t index; switch (format) { - case SkMask::kBW_Format: index = 0; break; - case SkMask::kA8_Format: index = 2; break; - case SkMask::kLCD16_Format: index = 4; break; + case SkMask::kA8_Format: index = 0; break; + case SkMask::kLCD16_Format: index = 2; break; default: return nullptr; } if (flags & kSrcIsOpaque_RowFlag) { index |= 1; } - SkASSERT((size_t)index < SK_ARRAY_COUNT(gProcs)); + SkASSERT(index < SK_ARRAY_COUNT(gProcs)); return gProcs[index]; + } default: break; } |