devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Use bit-doubled mask everywhere in mono bitmap drawing. ~2% speedup, and smaller.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21141 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2009-05-31 07:27:43 +00:00
parent d76c820587
commit f31e86338a
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
firmware/drivers/lcd-2bit-vert.c
View file

@ -719,6 +719,7 @@ void ICODE_ATTR lcd_mono_bitmap_part(const unsigned char *src, int src_x,
{ {
int shift, ny; int shift, ny;
fb_data *dst, *dst_end; fb_data *dst, *dst_end;
unsigned mask, mask_bottom;
lcd_blockfunc_type *bfunc; lcd_blockfunc_type *bfunc;
/* nothing to draw? */ /* nothing to draw? */
@ -754,17 +755,18 @@ void ICODE_ATTR lcd_mono_bitmap_part(const unsigned char *src, int src_x,
dst = &lcd_framebuffer[y>>2][x]; dst = &lcd_framebuffer[y>>2][x];
shift = y & 3; shift = y & 3;
ny = height - 1 + shift + src_y; ny = height - 1 + shift + src_y;
mask = 0xFFFFu << (2 * (shift + src_y));
/* Overflowing bits aren't important. */
mask_bottom = 0xFFFFu >> (2 * (~ny & 7));
bfunc = lcd_blockfuncs[current_vp->drawmode]; bfunc = lcd_blockfuncs[current_vp->drawmode];
if (shift == 0) if (shift == 0)
{ {
unsigned dmask1, dmask2, dmask_bottom, data; unsigned dmask1, dmask2, data;
dmask1 = 0xFFFFu << (2 * (shift + src_y)); dmask1 = mask & 0xFFu;
dmask2 = dmask1 >> 8; dmask2 = mask >> 8;
dmask1 &= 0xFFu;
dmask_bottom = 0xFFFFu >> (2 * (~ny & 7));
for (; ny >= 8; ny -= 8) for (; ny >= 8; ny -= 8)
{ {
@ -793,9 +795,9 @@ void ICODE_ATTR lcd_mono_bitmap_part(const unsigned char *src, int src_x,
dst += 2*LCD_WIDTH; dst += 2*LCD_WIDTH;
dmask1 = dmask2 = 0xFFu; dmask1 = dmask2 = 0xFFu;
} }
dmask1 &= dmask_bottom; dmask1 &= mask_bottom;
/* & 0xFFu is unnecessary here - dmask1 can't exceed that*/ /* & 0xFFu is unnecessary here - dmask1 can't exceed that*/
dmask2 &= (dmask_bottom >> 8); dmask2 &= (mask_bottom >> 8);
dst_end = dst + width; dst_end = dst + width;
if (dmask1 != 0) if (dmask1 != 0)
@ -826,9 +828,6 @@ void ICODE_ATTR lcd_mono_bitmap_part(const unsigned char *src, int src_x,
} }
else else
{ {
unsigned mask = 0xFFu << (shift + src_y);
unsigned mask_bottom = 0xFFu >> (~ny & 7);
dst_end = dst + width; dst_end = dst + width;
do do
{ {
@ -841,27 +840,27 @@ void ICODE_ATTR lcd_mono_bitmap_part(const unsigned char *src, int src_x,
{ {
data |= *src_col << shift; data |= *src_col << shift;
if (mask_col & 0xFFu) if (mask_col & 0xFFFFu)
{ {
if (mask_col & 0x0F) if (mask_col & 0xFFu)
bfunc(dst_col, lcd_dibits[mask_col&0x0F], lcd_dibits[data&0x0F]); bfunc(dst_col, mask_col, lcd_dibits[data&0x0F]);
bfunc(dst_col + LCD_WIDTH, lcd_dibits[(mask_col>>4)&0x0F], bfunc(dst_col + LCD_WIDTH, mask_col >> 8,
lcd_dibits[(data>>4)&0x0F]); lcd_dibits[(data>>4)&0x0F]);
mask_col = 0xFFu; mask_col = 0xFFFFu;
} }
else else
mask_col >>= 8; mask_col >>= 16;
src_col += stride; src_col += stride;
dst_col += 2*LCD_WIDTH; dst_col += 2*LCD_WIDTH;
data >>= 8; data >>= 8;
} }
data |= *src_col << shift; data |= *src_col << shift;
mask_bottom &= mask_col; mask_col &= mask_bottom ;
if (mask_bottom & 0x0F) if (mask_col & 0xFFu)
bfunc(dst_col, lcd_dibits[mask_bottom&0x0F], lcd_dibits[data&0x0F]); bfunc(dst_col, mask_col, lcd_dibits[data&0x0F]);
if (mask_bottom & 0xF0) if (mask_col & 0xFF00u)
bfunc(dst_col + LCD_WIDTH, lcd_dibits[(mask_bottom&0xF0)>>4], bfunc(dst_col + LCD_WIDTH, mask_col >> 8,
lcd_dibits[(data>>4)&0x0F]); lcd_dibits[(data>>4)&0x0F]);
} }
while (dst < dst_end); while (dst < dst_end);