old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sun May 8 21:13:45 2005 Michael Jennings (mej) 

Patch from Tres Melton <tres@mindspring.com> to fix 15bpp shading
routines.
----------------------------------------------------------------------


SVN revision: 14679
This commit is contained in:
Michael Jennings 2005-05-09 01:17:25 +00:00
parent f5e5778a3e
commit 1570ec6d43
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5376,3 +5376,8 @@ Sat May 7 02:30:53 2005 Michael Jennings (mej)
Patch from Tres Melton <tres@mindspring.com> to correct overflow in
non-MMX 16bpp shading code.
----------------------------------------------------------------------
Sun May 8 21:13:45 2005 Michael Jennings (mej)
Patch from Tres Melton <tres@mindspring.com> to fix 15bpp shading
routines.
----------------------------------------------------------------------

2
src/mmx_cmod.S
View File

@ -198,6 +198,7 @@ shade_ximage_15_mmx_saturate:
paddusw %mm3, %mm1 /* ff eg */
paddusw %mm3, %mm2 /* ff eb */
psubw %mm3, %mm0 /* 00 0r */
psubw %mm3, %mm1 /* 00 0g */
psubw %mm3, %mm2 /* 00 0b */
@ -234,6 +235,7 @@ shade_ximage_15_mmx_saturate:
paddusw %mm3, %mm1 /* ff eg */
paddusw %mm3, %mm2 /* ff eb */
psubw %mm3, %mm0 /* 00 0r */
psubw %mm3, %mm1 /* 00 0g */
psubw %mm3, %mm2 /* 00 0b */

17
src/pixmap.c
View File

@ -1578,16 +1578,13 @@ shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
for (x = -w; x < 0; x++) {
int r, g, b;
b = ((DATA16 *) ptr)[x];
r = (b & 0x7c00) * rm;
g = (b & 0x3e0) * gm;
b = (b & 0x1f) * bm;
r |= (!(r >> 15) - 1);
g |= (!(g >> 10) - 1);
b |= (!(b >> 5) - 1);
((DATA16 *) ptr)[x] = ((r >> 8) & 0x7c00)
| ((g >> 8) & 0x3e0)
| ((b >> 8) & 0x1f);
r = ( (b >> 10 ) * rm ) >> 8;
r = ( r > 0x001f ) ? 0xfc00 : ( r << 10 );
g = (((b >> 5 ) & 0x003f ) * gm ) >> 8;
g = ( g > 0x001f ) ? 0x03e0 : ( g << 5 );
b = (( b & 0x001f ) * bm ) >> 8;
b = ( b > 0x001f ) ? 0x001f : b;
((DATA16 *) ptr)[x] = (r|g|b);
}
ptr += bpl;
}