mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-29 07:19:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Possibly slightly faster bitmap plotter.

Browse Source 
svn path=/trunk/netsurf/; revision=6647
This commit is contained in:
Michael Drake 2009-02-26 23:05:06 +00:00
parent 7af238ab7f
commit 6b064b526c
2 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
framebuffer/fb_16bpp_plotters.c
View File

@ -33,14 +33,14 @@
static inline uint16_t * static inline uint16_t *
fb_16bpp_get_xy_loc(int x, int y) fb_16bpp_get_xy_loc(int x, int y)
{ {
return (void *)(framebuffer->ptr + return (void *)(framebuffer->ptr +
(y * framebuffer->linelen) + (y * framebuffer->linelen) +
(x << 1)); (x << 1));
} }
static inline colour fb_16bpp_to_colour(uint16_t pixel) static inline colour fb_16bpp_to_colour(uint16_t pixel)
{ {
return ((pixel & 0x1F) << 19) | return ((pixel & 0x1F) << 19) |
((pixel & 0x7E0) << 5) | ((pixel & 0x7E0) << 5) |
((pixel & 0xF800) >> 8); ((pixel & 0xF800) >> 8);
} }
@ -114,7 +114,7 @@ static bool fb_16bpp_line(int x0, int y0, int x1, int y1, int width,
x = dyabs >> 1; x = dyabs >> 1;
y = dxabs >> 1; y = dxabs >> 1;
if (dxabs >= dyabs) { if (dxabs >= dyabs) {
/* the line is more horizontal than vertical */ /* the line is more horizontal than vertical */
for (i = 0; i <= dxabs; i++) { for (i = 0; i <= dxabs; i++) {
*pvideo = ent; *pvideo = ent;
@ -139,7 +139,7 @@ static bool fb_16bpp_line(int x0, int y0, int x1, int y1, int width,
} }
} }
} }
} }
@ -240,7 +240,7 @@ fb_16bpp_draw_ft_bitmap(FT_Bitmap *bp, int x, int y, colour c)
uint32_t fgcol; uint32_t fgcol;
/* The part of the scaled image actually displayed is cropped to the /* The part of the scaled image actually displayed is cropped to the
* current context. * current context.
*/ */
x0 = x; x0 = x;
y0 = y; y0 = y;
@ -269,7 +269,7 @@ fb_16bpp_draw_ft_bitmap(FT_Bitmap *bp, int x, int y, colour c)
abpixel = (pixel[((yoff + yloop) * bp->pitch) + xloop + xoff] << 24) | fgcol; abpixel = (pixel[((yoff + yloop) * bp->pitch) + xloop + xoff] << 24) | fgcol;
if ((abpixel & 0xFF000000) != 0) { if ((abpixel & 0xFF000000) != 0) {
if ((abpixel & 0xFF000000) != 0xFF000000) { if ((abpixel & 0xFF000000) != 0xFF000000) {
abpixel = fb_plotters_ablend(abpixel, abpixel = fb_plotters_ablend(abpixel,
fb_16bpp_to_colour(*(pvideo + xloop))); fb_16bpp_to_colour(*(pvideo + xloop)));
} }
@ -301,17 +301,17 @@ static bool fb_16bpp_text(int x, int y, const struct css_style *style,
if (glyph->format == FT_GLYPH_FORMAT_BITMAP) { if (glyph->format == FT_GLYPH_FORMAT_BITMAP) {
bglyph = (FT_BitmapGlyph)glyph; bglyph = (FT_BitmapGlyph)glyph;
/* now, draw to our target surface */ /* now, draw to our target surface */
if (bglyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) { if (bglyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
fb_16bpp_draw_ft_monobitmap(&bglyph->bitmap, fb_16bpp_draw_ft_monobitmap(&bglyph->bitmap,
x + bglyph->left, x + bglyph->left,
y - bglyph->top, y - bglyph->top,
c); c);
} else { } else {
fb_16bpp_draw_ft_bitmap(&bglyph->bitmap, fb_16bpp_draw_ft_bitmap(&bglyph->bitmap,
x + bglyph->left, x + bglyph->left,
y - bglyph->top, y - bglyph->top,
c); c);
} }
} }
x += glyph->advance.x >> 16; x += glyph->advance.x >> 16;
@ -341,7 +341,7 @@ static bool fb_16bpp_text(int x, int y, const struct css_style *style,
/* aquire thge text in local font encoding */ /* aquire thge text in local font encoding */
utf8_to_font_encoding(fb_font, text, length, (char **)&buffer); utf8_to_font_encoding(fb_font, text, length, (char **)&buffer);
if (!buffer) if (!buffer)
return true; return true;
length = strlen((char *)buffer); length = strlen((char *)buffer);
@ -350,7 +350,7 @@ static bool fb_16bpp_text(int x, int y, const struct css_style *style,
y-=((fb_font->height * 75)/100); y-=((fb_font->height * 75)/100);
y+=1; /* the coord is the bottom-left of the pixels offset by 1 to make y+=1; /* the coord is the bottom-left of the pixels offset by 1 to make
* it work since fb coords are the top-left of pixels * it work since fb coords are the top-left of pixels
*/ */
/* The part of the text displayed is cropped to the current context. */ /* The part of the text displayed is cropped to the current context. */
@ -380,7 +380,7 @@ static bool fb_16bpp_text(int x, int y, const struct css_style *style,
if ((x + fb_font->width) > x1) if ((x + fb_font->width) > x1)
break; break;
if (x < x0) if (x < x0)
continue; continue;
pvideo = fb_16bpp_get_xy_loc(x, y0); pvideo = fb_16bpp_get_xy_loc(x, y0);
@ -432,11 +432,11 @@ static bool fb_16bpp_bitmap(int x, int y, int width, int height,
int x0,y0,x1,y1; int x0,y0,x1,y1;
int xoff, yoff; /* x and y offset into image */ int xoff, yoff; /* x and y offset into image */
/* LOG(("x %d, y %d, width %d, height %d, bitmap %p, content %p", /* LOG(("x %d, y %d, width %d, height %d, bitmap %p, content %p",
x,y,width,height,bitmap,content));*/ x,y,width,height,bitmap,content));*/
/* TODO here we should scale the image from bitmap->width to width, for /* TODO here we should scale the image from bitmap->width to width, for
* now simply crop. * now simply crop.
*/ */
if (width > bitmap->width) if (width > bitmap->width)
width = bitmap->width; width = bitmap->width;
@ -445,7 +445,7 @@ static bool fb_16bpp_bitmap(int x, int y, int width, int height,
height = bitmap->height; height = bitmap->height;
/* The part of the scaled image actually displayed is cropped to the /* The part of the scaled image actually displayed is cropped to the
* current context. * current context.
*/ */
x0 = x; x0 = x;
y0 = y; y0 = y;
@ -462,17 +462,18 @@ static bool fb_16bpp_bitmap(int x, int y, int width, int height,
width = (x1 - x0); width = (x1 - x0);
xoff = x0 - x; xoff = x0 - x;
yoff = y0 - y; yoff = (y0 - y) * bitmap->width;
height *= bitmap->width;
/* plot the image */ /* plot the image */
pvideo = fb_16bpp_get_xy_loc(x0, y0); pvideo = fb_16bpp_get_xy_loc(x0, y0);
for (yloop = 0; yloop < height; yloop++) { for (yloop = yoff; yloop < height; yloop += bitmap->width) {
for (xloop = 0; xloop < width; xloop++) { for (xloop = 0; xloop < width; xloop++) {
abpixel = pixel[((yoff + yloop) * bitmap->width) + xloop + xoff]; abpixel = pixel[yloop + xloop + xoff];
if ((abpixel & 0xFF000000) != 0) { if ((abpixel & 0xFF000000) != 0) {
if ((abpixel & 0xFF000000) != 0xFF000000) { if ((abpixel & 0xFF000000) != 0xFF000000) {
abpixel = fb_plotters_ablend(abpixel, abpixel = fb_plotters_ablend(abpixel,
fb_16bpp_to_colour(*(pvideo + xloop))); fb_16bpp_to_colour(*(pvideo + xloop)));
} }
@ -490,7 +491,7 @@ static bool fb_16bpp_bitmap_tile(int x, int y, int width, int height,
bool repeat_x, bool repeat_y, bool repeat_x, bool repeat_y,
struct content *content) struct content *content)
{ {
return fb_plotters_bitmap_tile(x, y, width, height, return fb_plotters_bitmap_tile(x, y, width, height,
bitmap, bg, repeat_x, repeat_y, bitmap, bg, repeat_x, repeat_y,
content, fb_16bpp_bitmap); content, fb_16bpp_bitmap);
} }

83
framebuffer/fb_32bpp_plotters.c
View File

@ -33,16 +33,16 @@
static inline uint32_t * static inline uint32_t *
fb_32bpp_get_xy_loc(int x, int y) fb_32bpp_get_xy_loc(int x, int y)
{ {
return (uint32_t *)(framebuffer->ptr + return (uint32_t *)(framebuffer->ptr +
(y * framebuffer->linelen) + (y * framebuffer->linelen) +
(x << 2)); (x << 2));
} }
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
static inline colour fb_32bpp_to_colour(uint32_t pixel) static inline colour fb_32bpp_to_colour(uint32_t pixel)
{ {
return ((pixel & 0xFF00) >> 8) | return ((pixel & 0xFF00) >> 8) |
((pixel & 0xFF0000) >> 8) | ((pixel & 0xFF0000) >> 8) |
((pixel & 0xFF000000) >> 8); ((pixel & 0xFF000000) >> 8);
} }
@ -54,8 +54,8 @@ static inline uint32_t fb_colour_to_pixel(colour c)
#else #else
static inline colour fb_32bpp_to_colour(uint32_t pixel) static inline colour fb_32bpp_to_colour(uint32_t pixel)
{ {
return ((pixel & 0xFF) << 16) | return ((pixel & 0xFF) << 16) |
((pixel & 0xFF00)) | ((pixel & 0xFF00)) |
((pixel & 0xFF0000) >> 16); ((pixel & 0xFF0000) >> 16);
} }
@ -121,7 +121,7 @@ static bool fb_32bpp_line(int x0, int y0, int x1, int y1, int width,
x = dyabs >> 1; x = dyabs >> 1;
y = dxabs >> 1; y = dxabs >> 1;
if (dxabs >= dyabs) { if (dxabs >= dyabs) {
/* the line is more horizontal than vertical */ /* the line is more horizontal than vertical */
for (i = 0; i <= dxabs; i++) { for (i = 0; i <= dxabs; i++) {
*pvideo = ent; *pvideo = ent;
@ -146,7 +146,7 @@ static bool fb_32bpp_line(int x0, int y0, int x1, int y1, int width,
} }
} }
} }
} }
return true; return true;
@ -191,7 +191,7 @@ static bool fb_32bpp_fill(int x0, int y0, int x1, int y1, colour c)
pvid = fb_32bpp_get_xy_loc(x0, y0); pvid = fb_32bpp_get_xy_loc(x0, y0);
while (height-- > 0) { while (height-- > 0) {
for (w = width; w > 0; w--) *pvid++ = ent; for (w = width; w > 0; w--) *pvid++ = ent;
pvid += llen; pvid += llen;
} }
@ -200,10 +200,10 @@ static bool fb_32bpp_fill(int x0, int y0, int x1, int y1, colour c)
static bool fb_32bpp_clg(colour c) static bool fb_32bpp_clg(colour c)
{ {
fb_32bpp_fill(fb_plot_ctx.x0, fb_32bpp_fill(fb_plot_ctx.x0,
fb_plot_ctx.y0, fb_plot_ctx.y0,
fb_plot_ctx.x1, fb_plot_ctx.x1,
fb_plot_ctx.y1, fb_plot_ctx.y1,
c); c);
return true; return true;
} }
@ -234,7 +234,7 @@ fb_32bpp_draw_ft_monobitmap(FT_Bitmap *bp, int x, int y, colour c)
y+=1; /* the coord is the bottom-left of the pixels offset by 1 to make y+=1; /* the coord is the bottom-left of the pixels offset by 1 to make
* it work since fb coords are the top-left of pixels * it work since fb coords are the top-left of pixels
*/ */
/* The part of the text displayed is cropped to the current context. */ /* The part of the text displayed is cropped to the current context. */
@ -267,16 +267,16 @@ fb_32bpp_draw_ft_monobitmap(FT_Bitmap *bp, int x, int y, colour c)
if ((xloop % 8) == 0) { if ((xloop % 8) == 0) {
row = *fntd++; row = *fntd++;
} }
if ((row & 0x80) != 0) { if ((row & 0x80) != 0) {
*(pvideo + xloop) = fgcol; *(pvideo + xloop) = fgcol;
} }
row = row << 1; row = row << 1;
} }
pvideo += (framebuffer->linelen >> 2); pvideo += (framebuffer->linelen >> 2);
} }
return true; return true;
} }
@ -295,7 +295,7 @@ fb_32bpp_draw_ft_bitmap(FT_Bitmap *bp, int x, int y, colour c)
uint32_t fgcol; uint32_t fgcol;
/* The part of the scaled image actually displayed is cropped to the /* The part of the scaled image actually displayed is cropped to the
* current context. * current context.
*/ */
x0 = x; x0 = x;
y0 = y; y0 = y;
@ -325,7 +325,7 @@ fb_32bpp_draw_ft_bitmap(FT_Bitmap *bp, int x, int y, colour c)
if ((abpixel & 0xFF000000) != 0) { if ((abpixel & 0xFF000000) != 0) {
/* pixel is not transparent */ /* pixel is not transparent */
if ((abpixel & 0xFF000000) != 0xFF000000) { if ((abpixel & 0xFF000000) != 0xFF000000) {
abpixel = fb_plotters_ablend(abpixel, abpixel = fb_plotters_ablend(abpixel,
fb_32bpp_to_colour(*(pvideo + xloop))); fb_32bpp_to_colour(*(pvideo + xloop)));
} }
@ -351,23 +351,23 @@ static bool fb_32bpp_text(int x, int y, const struct css_style *style,
nxtchr = utf8_next(text, length, nxtchr); nxtchr = utf8_next(text, length, nxtchr);
glyph = fb_getglyph(style, ucs4); glyph = fb_getglyph(style, ucs4);
if (glyph == NULL) if (glyph == NULL)
continue; continue;
if (glyph->format == FT_GLYPH_FORMAT_BITMAP) { if (glyph->format == FT_GLYPH_FORMAT_BITMAP) {
bglyph = (FT_BitmapGlyph)glyph; bglyph = (FT_BitmapGlyph)glyph;
/* now, draw to our target surface */ /* now, draw to our target surface */
if (bglyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) { if (bglyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
fb_32bpp_draw_ft_monobitmap(&bglyph->bitmap, fb_32bpp_draw_ft_monobitmap(&bglyph->bitmap,
x + bglyph->left, x + bglyph->left,
y - bglyph->top, y - bglyph->top,
c); c);
} else { } else {
fb_32bpp_draw_ft_bitmap(&bglyph->bitmap, fb_32bpp_draw_ft_bitmap(&bglyph->bitmap,
x + bglyph->left, x + bglyph->left,
y - bglyph->top, y - bglyph->top,
c); c);
} }
} }
x += glyph->advance.x >> 16; x += glyph->advance.x >> 16;
@ -395,7 +395,7 @@ static bool fb_32bpp_text(int x, int y, const struct css_style *style,
/* aquire thge text in local font encoding */ /* aquire thge text in local font encoding */
utf8_to_font_encoding(fb_font, text, length, (char**)&buffer); utf8_to_font_encoding(fb_font, text, length, (char**)&buffer);
if (!buffer) if (!buffer)
return true; return true;
length = strlen((char *)buffer); length = strlen((char *)buffer);
@ -404,7 +404,7 @@ static bool fb_32bpp_text(int x, int y, const struct css_style *style,
y-=((fb_font->height * 75)/100); y-=((fb_font->height * 75)/100);
y+=1; /* the coord is the bottom-left of the pixels offset by 1 to make y+=1; /* the coord is the bottom-left of the pixels offset by 1 to make
* it work since fb coords are the top-left of pixels * it work since fb coords are the top-left of pixels
*/ */
/* The part of the text displayed is cropped to the current context. */ /* The part of the text displayed is cropped to the current context. */
@ -434,7 +434,7 @@ static bool fb_32bpp_text(int x, int y, const struct css_style *style,
if ((x + fb_font->width) > x1) if ((x + fb_font->width) > x1)
break; break;
if (x < x0) if (x < x0)
continue; continue;
pvideo = fb_32bpp_get_xy_loc(x, y0); pvideo = fb_32bpp_get_xy_loc(x, y0);
@ -478,7 +478,7 @@ static inline colour ablend(colour pixel)
static bool fb_32bpp_bitmap(int x, int y, int width, int height, static bool fb_32bpp_bitmap(int x, int y, int width, int height,
struct bitmap *bitmap, colour bg, struct bitmap *bitmap, colour bg,
struct content *content) struct content *content)
{ {
uint32_t *pvideo; uint32_t *pvideo;
@ -488,11 +488,11 @@ static bool fb_32bpp_bitmap(int x, int y, int width, int height,
int x0,y0,x1,y1; int x0,y0,x1,y1;
int xoff, yoff; /* x and y offset into image */ int xoff, yoff; /* x and y offset into image */
/* LOG(("x %d, y %d, width %d, height %d, bitmap %p, content %p", /* LOG(("x %d, y %d, width %d, height %d, bitmap %p, content %p",
x,y,width,height,bitmap,content));*/ x,y,width,height,bitmap,content));*/
/* TODO here we should scale the image from bitmap->width to width, for /* TODO here we should scale the image from bitmap->width to width, for
* now simply crop. * now simply crop.
*/ */
if (width > bitmap->width) if (width > bitmap->width)
width = bitmap->width; width = bitmap->width;
@ -501,7 +501,7 @@ static bool fb_32bpp_bitmap(int x, int y, int width, int height,
height = bitmap->height; height = bitmap->height;
/* The part of the scaled image actually displayed is cropped to the /* The part of the scaled image actually displayed is cropped to the
* current context. * current context.
*/ */
x0 = x; x0 = x;
y0 = y; y0 = y;
@ -518,17 +518,18 @@ static bool fb_32bpp_bitmap(int x, int y, int width, int height,
width = (x1 - x0); width = (x1 - x0);
xoff = x0 - x; xoff = x0 - x;
yoff = y0 - y; yoff = (y0 - y) * bitmap->width;
height *= bitmap->width;
/* plot the image */ /* plot the image */
pvideo = fb_32bpp_get_xy_loc(x0, y0); pvideo = fb_32bpp_get_xy_loc(x0, y0);
for (yloop = 0; yloop < height; yloop++) { for (yloop = yoff; yloop < height; yloop += bitmap->width) {
for (xloop = 0; xloop < width; xloop++) { for (xloop = 0; xloop < width; xloop++) {
abpixel = pixel[((yoff + yloop) * bitmap->width) + xloop + xoff]; abpixel = pixel[yloop + xloop + xoff];
if ((abpixel & 0xFF000000) != 0) { if ((abpixel & 0xFF000000) != 0) {
if ((abpixel & 0xFF000000) != 0xFF000000) { if ((abpixel & 0xFF000000) != 0xFF000000) {
abpixel = fb_plotters_ablend(abpixel, abpixel = fb_plotters_ablend(abpixel,
fb_32bpp_to_colour(*(pvideo + xloop))); fb_32bpp_to_colour(*(pvideo + xloop)));
} }
@ -544,10 +545,10 @@ static bool fb_32bpp_bitmap(int x, int y, int width, int height,
static bool fb_32bpp_bitmap_tile(int x, int y, int width, int height, static bool fb_32bpp_bitmap_tile(int x, int y, int width, int height,
struct bitmap *bitmap, colour bg, struct bitmap *bitmap, colour bg,
bool repeat_x, bool repeat_y, bool repeat_x, bool repeat_y,
struct content *content) struct content *content)
{ {
return fb_plotters_bitmap_tile(x, y, width, height, return fb_plotters_bitmap_tile(x, y, width, height,
bitmap, bg, repeat_x, repeat_y, bitmap, bg, repeat_x, repeat_y,
content, fb_32bpp_bitmap); content, fb_32bpp_bitmap);
} }
@ -578,7 +579,7 @@ const struct plotter_table framebuffer_32bpp_plot = {
.arc = fb_32bpp_arc, .arc = fb_32bpp_arc,
.bitmap = fb_32bpp_bitmap, .bitmap = fb_32bpp_bitmap,
.bitmap_tile = fb_32bpp_bitmap_tile, .bitmap_tile = fb_32bpp_bitmap_tile,
.flush = fb_32bpp_flush, .flush = fb_32bpp_flush,
.path = fb_32bpp_path, .path = fb_32bpp_path,
.option_knockout = true, .option_knockout = true,
}; };