diff options
author | jcgregorio <jcgregorio@google.com> | 2015-04-15 06:17:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-15 06:17:10 -0700 |
commit | f91e676f941c7e9ec91ac298eaa32e4bf8f52762 (patch) | |
tree | 484750ff00d2efbb0f4754ff54e54a5d44c0bded /src/core/SkBlitter_ARGB32.cpp | |
parent | 7f00acbda6d35d2ba445a1e2909bb599b156cc5c (diff) |
Revert of add new blit2 methods in support of antialiased hairlines guard flag SK_SUPPORT_LEGACY_BLITANTIH2V2 (patchset #2 id:20001 of https://codereview.chromium.org/1060153003/)
Reason for revert:
DEPS roll is failing, one such example:
http://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_rel/builds/73847/steps/ash_unittests%20%28with%20patch%29/logs/stdio
More here:
https://codereview.chromium.org/1091483003
This CL was the only CL in the roll when things started to fail.
Original issue's description:
> add new blit2 methods in support of antialiased hairlines
>
> before:
> 9M 1 528µs 530µs 539µs 607µs 5% ▁▁▁▁▁▁▁▁█▂ 8888 path_hairline_small_AA_quad
>
> after:
> 9M 1 355µs 356µs 358µs 375µs 2% ▂▁▁▁▁▁▁▁▁█ 8888 path_hairline_small_AA_quad
>
> BUG=skia:
>
> does require new baselines (bug chrome is guarded)
>
> Committed: https://skia.googlesource.com/skia/+/dd83031b98db4c6d3d0de2353bf115152a7d1464
TBR=caryclark@google.com,reed@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1085013003
Diffstat (limited to 'src/core/SkBlitter_ARGB32.cpp')
-rw-r--r-- | src/core/SkBlitter_ARGB32.cpp | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp index caf85ddc1f..bbad6c7926 100644 --- a/src/core/SkBlitter_ARGB32.cpp +++ b/src/core/SkBlitter_ARGB32.cpp @@ -106,25 +106,6 @@ void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[], } } -#ifndef SK_SUPPORT_LEGACY_BLITANTIH2V2 -void SkARGB32_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) { - uint32_t* device = fDevice.getAddr32(x, y); - SkDEBUGCODE((void)fDevice.getAddr32(x + 1, y);) - - device[0] = SkBlendARGB32(fPMColor, device[0], a0); - device[1] = SkBlendARGB32(fPMColor, device[1], a1); -} - -void SkARGB32_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { - uint32_t* device = fDevice.getAddr32(x, y); - SkDEBUGCODE((void)fDevice.getAddr32(x, y + 1);) - - device[0] = SkBlendARGB32(fPMColor, device[0], a0); - device = (uint32_t*)((char*)device + fDevice.rowBytes()); - device[0] = SkBlendARGB32(fPMColor, device[0], a1); -} -#endif - ////////////////////////////////////////////////////////////////////////////////////// #define solid_8_pixels(mask, dst, color) \ @@ -199,25 +180,6 @@ void SkARGB32_Opaque_Blitter::blitMask(const SkMask& mask, } } -#ifndef SK_SUPPORT_LEGACY_BLITANTIH2V2 -void SkARGB32_Opaque_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) { - uint32_t* device = fDevice.getAddr32(x, y); - SkDEBUGCODE((void)fDevice.getAddr32(x + 1, y);) - - device[0] = SkFastFourByteInterp(fPMColor, device[0], a0); - device[1] = SkFastFourByteInterp(fPMColor, device[1], a1); -} - -void SkARGB32_Opaque_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { - uint32_t* device = fDevice.getAddr32(x, y); - SkDEBUGCODE((void)fDevice.getAddr32(x, y + 1);) - - device[0] = SkFastFourByteInterp(fPMColor, device[0], a0); - device = (uint32_t*)((char*)device + fDevice.rowBytes()); - device[0] = SkFastFourByteInterp(fPMColor, device[0], a1); -} -#endif - /////////////////////////////////////////////////////////////////////////////// void SkARGB32_Blitter::blitV(int x, int y, int height, SkAlpha alpha) { @@ -294,25 +256,6 @@ void SkARGB32_Black_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[], } } -#ifndef SK_SUPPORT_LEGACY_BLITANTIH2V2 -void SkARGB32_Black_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) { - uint32_t* device = fDevice.getAddr32(x, y); - SkDEBUGCODE((void)fDevice.getAddr32(x + 1, y);) - - device[0] = (a0 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a0); - device[1] = (a1 << SK_A32_SHIFT) + SkAlphaMulQ(device[1], 256 - a1); -} - -void SkARGB32_Black_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { - uint32_t* device = fDevice.getAddr32(x, y); - SkDEBUGCODE((void)fDevice.getAddr32(x, y + 1);) - - device[0] = (a0 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a0); - device = (uint32_t*)((char*)device + fDevice.rowBytes()); - device[0] = (a1 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a1); -} -#endif - /////////////////////////////////////////////////////////////////////////////// // Special version of SkBlitRow::Factory32 that knows we're in kSrc_Mode, |