AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove opaque versions of Color32_D565

Browse Source 
Removes the opaque-only versions of this function from the factory since
they will never be used. Opaque source colors are handled in
SkRGB16_Opaque_Blitter instead, which doesn't use the factory function.

Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>

Review URL: https://codereview.chromium.org/901593002
This commit is contained in:
henrik.smiding 2015-02-08 16:03:27 -08:00 committed by Commit bot
parent 4f66d5b9b1
commit e6b1a60758
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/SkBlitRow_D16.cpp
View File

@ -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));

2
src/opts/SkBlitRow_opts_arm.cpp
View File

@ -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
};