Author: vince Date: Fri Feb 27 05:36:18 2009 New Revision: 6657 URL: http://source.netsurf-browser.org?rev=6657&view=rev Log: Unroll some fill loops, enable adrianl improved ablend function Modified: trunk/netsurf/framebuffer/fb_16bpp_plotters.c trunk/netsurf/framebuffer/fb_32bpp_plotters.c trunk/netsurf/framebuffer/fb_frontend_sdl.c trunk/netsurf/framebuffer/fb_plotters.h Modified: trunk/netsurf/framebuffer/fb_16bpp_plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_16bpp_plot... ============================================================================== --- trunk/netsurf/framebuffer/fb_16bpp_plotters.c (original) +++ trunk/netsurf/framebuffer/fb_16bpp_plotters.c Fri Feb 27 05:36:18 2009 @@ -191,7 +191,28 @@ pvid32 = (uint32_t *)pvid16; while (height-- > 0) { - for (w = width; w > 0; w--) *pvid32++ = ent32; + w = width; + while (w >= 16) { + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + w-=16; + } + while (w >= 4) { + *pvid32++ = ent32; *pvid32++ = ent32; + *pvid32++ = ent32; *pvid32++ = ent32; + w-=4; + } + while (w > 0) { + *pvid32++ = ent32; + w--; + } + // for (w = width; w > 0; w--) *pvid32++ = ent32; pvid32 += llen; } Modified: trunk/netsurf/framebuffer/fb_32bpp_plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_32bpp_plot... ============================================================================== --- trunk/netsurf/framebuffer/fb_32bpp_plotters.c (original) +++ trunk/netsurf/framebuffer/fb_32bpp_plotters.c Fri Feb 27 05:36:18 2009 @@ -189,30 +189,27 @@ pvid = fb_32bpp_get_xy_loc(x0, y0); while (height-- > 0) { -#if 1 - for (w = width; w > 0; w--) *pvid++ = ent; -#else - uint32_t *evid = pvid + width; - while (pvid <= evid - 16) { + w = width; + while (w >= 16) { + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + w-=16; + } + while (w >= 4) { + *pvid++ = ent; *pvid++ = ent; + *pvid++ = ent; *pvid++ = ent; + w-=4; + } + while (w > 0) { *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - *pvid++ = ent; - } - while (pvid < evid) *pvid++ = ent; -#endif + w--; + } pvid += llen; } Modified: trunk/netsurf/framebuffer/fb_frontend_sdl.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_frontend_s... ============================================================================== --- trunk/netsurf/framebuffer/fb_frontend_sdl.c (original) +++ trunk/netsurf/framebuffer/fb_frontend_sdl.c Fri Feb 27 05:36:18 2009 @@ -184,8 +184,8 @@ case SDL_BUTTON_MIDDLE: default: - printf("Mouse button %d pressed at (%d,%d)\n", - event.button.button, event.button.x, event.button.y); + LOG(("Mouse button %d pressed at (%d,%d)\n", + event.button.button, event.button.x, event.button.y)); } break; @@ -206,8 +206,8 @@ break; default: - printf("Mouse button %d pressed at (%d,%d)\n", - event.button.button, event.button.x, event.button.y); + LOG(("Mouse button %d pressed at (%d,%d)\n", + event.button.button, event.button.x, event.button.y)); } break; Modified: trunk/netsurf/framebuffer/fb_plotters.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_plotters.h... ============================================================================== --- trunk/netsurf/framebuffer/fb_plotters.h (original) +++ trunk/netsurf/framebuffer/fb_plotters.h Fri Feb 27 05:36:18 2009 @@ -50,7 +50,7 @@ /* alpha blend two pixels together */ static inline colour fb_plotters_ablend(colour pixel, colour scrpixel) { -#if 1 +#if 0 int opacity = (pixel >> 24) & 0xFF; int r,g,b; @@ -74,7 +74,7 @@ g = ((pixel & 0x00FF00) * opacity + (scrpixel & 0x00FF00) * transp) >> 8; - return (rb & 0xFF0FF) | (g & 0xFF00); + return (rb & 0xFF00FF) | (g & 0xFF00); #endif }