r13362 mono - /trunk/netsurf/atari/plot/plotter_vdi.c
by netsurf＠semichrome.net
Author: mono
Date: Sun Jan 1 18:08:14 2012
New Revision: 13362
URL: http://source.netsurf-browser.org?rev=13362&view=rev
Log:
256 color plotting: Use vdi to rgb lookup table, made transparency a bit better ( the snapshot problem was related to fvdi, no error in code )
Modified:
trunk/netsurf/atari/plot/plotter_vdi.c
Modified: trunk/netsurf/atari/plot/plotter_vdi.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/plotter_vdi.c?...
==============================================================================
--- trunk/netsurf/atari/plot/plotter_vdi.c (original)
+++ trunk/netsurf/atari/plot/plotter_vdi.c Sun Jan 1 18:08:14 2012
@@ -75,6 +75,7 @@
#ifdef WITH_8BPP_SUPPORT
static unsigned short sys_pal[256][3]; /*RGB*/
static unsigned short pal[256][3]; /*RGB*/
+static char rgb_lookup[256][4];
extern unsigned short vdi_web_pal[126][3];
#endif
extern struct s_vdi_sysinfo vdi_sysinfo;
@@ -206,13 +207,14 @@
/* here we define 20 additional gray colors... */
rgbcol[1] = rgbcol[2] = rgbcol[3] = ((graytone&0x0F) << 4);
rgb_to_vdi1000( &rgbcol[0], &pal[i][0] );
- printf("graytone: %d (%x), index: %d\n",rgbcol[1], rgbcol[1],i );
vs_color( self->vdi_handle, i, &pal[i][0] );
graytone++;
}
}
- }
+ vdi1000_to_rgb( &pal[i], &rgb_lookup[i][0] );
+ }
+
} else {
/* no need to change the palette - its application specific */
}
@@ -254,6 +256,10 @@
for( i=0; i<MAX_FRAMEBUFS; i++) {
if( self->fbuf[i].mem != NULL )
free( self->fbuf[i].mem );
+ }
+
+ for( i=OFFSET_WEB_PAL; i<OFFSET_CUST_PAL+16; i++){
+ vs_color( self->vdi_handle, i, &sys_pal[i][0] );
}
@@ -803,23 +809,6 @@
self->vdi_handle, S_ONLY, (short*)&pxy,
&scr, &DUMMY_PRIV(self)->buf_scr
);
- dbg_pxy("ntv snap", pxy );
-
-/*
-Debug: output copy to screen:
- pxy[0] = 0;
- pxy[1] = 0;
- pxy[2] = pxy[0] + w-1;
- pxy[3] = pxy[1] + h-1;
- pxy[4] = x+20;
- pxy[5] = y;
- pxy[6] = w-1;
- pxy[7] = h-1;
- vro_cpyfm(
- self->vdi_handle, S_ONLY, (short*)&pxy,
- &DUMMY_PRIV(self)->buf_scr,&scr
- );
-*/
return( &DUMMY_PRIV(self)->buf_scr );
}
@@ -959,7 +948,7 @@
}
-void set_stdpx( MFDB * dst, int x, int y, unsigned char val )
+inline void set_stdpx( MFDB * dst, int x, int y, unsigned char val )
{
int p;
short * buf;
@@ -974,7 +963,7 @@
}
}
-unsigned char get_stdpx(MFDB * dst, int x, int y )
+inline unsigned char get_stdpx(MFDB * dst, int x, int y )
{
unsigned char ret=0;
int p;
@@ -1074,41 +1063,57 @@
stdform.fd_stand = 1;
stdform.fd_nplanes = (short)self->bpp_virt;
stdform.fd_r1 = stdform.fd_r2 = stdform.fd_r3 = 0;
- /*printf("bpp virt: %d, bytestr: %d, planesize %d\n",
- self->bpp_virt, ((dststride >> 3) * self->bpp_virt), stdform.fd_wdwidth*stdform.fd_h );
- */
- // convert pixels to std. format
+
int wdplanesz = stdform.fd_wdwidth*stdform.fd_h;
int bytestride = (dststride >> 3) * self->bpp_virt;
unsigned long max = ((char*)stdform.fd_addr)+dstsize;
int img_stride = bitmap_get_rowstride(bm);
-
- // first, get snapshot in planar buffer,
- // then apply transparency.
+ unsigned char rgb[4];
+ uint32_t prev_pixel = 0x12345678;
+ unsigned char prev_col = 1;
+ unsigned char col = 0;
+ unsigned long bgcol = 0;
+ unsigned char val = 0;
+
+ // apply transparency.
for( y=0; y<clip->g_h; y++ ){
uint32_t * imgpixel;
imgpixel = (uint32_t *)(bm->pixdata + (img_stride * (y+clip->g_y)));
for( x=0; x<clip->g_w; x++ ){
+
uint32_t pixel = imgpixel[x+clip->g_x];
- unsigned long col = ABGR_TO_RGB( (pixel&0xFFFFFF00)>>8 );
- unsigned char val = RGB_TO_VDI( col>>8 );
+
if( (pixel&0xFF) == 0 ){
- set_stdpx( &stdform, x,y, get_stdpx( &stdform,x,y ) );
continue;
}
- if( (pixel&0xFF) >=128 ){
+ if( (pixel&0xFF) < 0xF0 ){
+ col = get_stdpx( &stdform,x,y );
+ if( col != prev_col )
+ bgcol = (((rgb_lookup[col][2] << 16) | (rgb_lookup[col][1] << 8) | (rgb_lookup[col][0]))<<8);
+ if( prev_col != col || prev_pixel != pixel ){
+ prev_col = col;
+ pixel = ablend( pixel, bgcol );
+ pixel = pixel >> 8;
+ /* convert pixel value to vdi color index: */
+ col = ( ((pixel&0xFF)<<16)
+ | (pixel&0xFF00)
+ | ((pixel&0xFF0000)>>16) );
+ val = RGB_TO_VDI( col );
+ }
set_stdpx( &stdform, x,y, val );
} else {
- char rgb[4];
- col = get_stdpx( &stdform,x,y );
- // TBD: use lookup table!
- vdi1000_to_rgb( &pal[col], &rgb[0] );
- pixel = ablend( pixel, ((rgb[2] << 16) | (rgb[1] << 8) | (rgb[0]))<<8 );
- col = ABGR_TO_RGB( (pixel&0xFFFFFF00)>>8 );
- val = RGB_TO_VDI( col>>8 );
+ if( pixel != prev_pixel ){
+ /* convert pixel value to vdi color index: */
+ pixel = pixel >> 8;
+ col = ( ((pixel&0xFF)<<16)
+ | (pixel&0xFF00)
+ | ((pixel&0xFF0000)>>16) );
+ val = RGB_TO_VDI( col );
+ }
set_stdpx( &stdform, x,y, val );
}
+ prev_pixel = pixel;
}
}
