diff options
| -rw-r--r-- | src/core/SkBlitRow_D16.cpp | 11 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm.cpp | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/core/SkBlitRow_D16.cpp b/src/core/SkBlitRow_D16.cpp index 6bf4cea997..d5082769c5 100644 --- a/src/core/SkBlitRow_D16.cpp +++ b/src/core/SkBlitRow_D16.cpp @@ -255,14 +255,10 @@ SkBlitRow::Proc16 SkBlitRow::Factory16(unsigned flags) { static const SkBlitRow::ColorProc16 gDefault_565_ColorProcs[] = { #if 0 - Color32_D565, Color32A_D565, - Color32_D565_Dither, Color32A_D565_Dither #else - // TODO: stop cheating and fill in the above specializations! - Color32A_D565, - Color32A_D565, + // TODO: stop cheating and fill dither from the above specializations! Color32A_D565, Color32A_D565, #endif @@ -272,8 +268,9 @@ SkBlitRow::ColorProc16 SkBlitRow::ColorFactory16(unsigned flags) { SkASSERT((flags & ~kFlags16_Mask) == 0); // just so we don't crash flags &= kFlags16_Mask; - // we ignore kGlobalAlpha_Flag, so shift down - flags >>= 1; + // we ignore both kGlobalAlpha_Flag and kSrcPixelAlpha_Flag, so shift down + // since this factory is only used for transparent source alphas + flags >>= 2; SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_ColorProcs)); diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp index 9dc9f3b593..eacaa402c3 100644 --- a/src/opts/SkBlitRow_opts_arm.cpp +++ b/src/opts/SkBlitRow_opts_arm.cpp @@ -365,9 +365,7 @@ static const SkBlitRow::Proc16 sk_blitrow_platform_565_procs_arm[] = { }; static const SkBlitRow::ColorProc16 sk_blitrow_platform_565_colorprocs_arm[] = { - NULL, // Color32_D565, NULL, // Color32A_D565, - NULL, // Color32_D565_Dither, NULL, // Color32A_D565_Dither }; |