Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-31 01:51:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

make stv_add_blend return a MAKE_RGB and fix sprite shadow (was shifting alpha bit into rgb, intensifying red was obviously wrong)

Browse Source
This commit is contained in:
Michaël Banaan Ananas 2012-02-06 22:13:41 +00:00
parent 00ea5b80cc
commit be53feaba2
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mame/video/stvvdp2.c
View File

@ -2436,10 +2436,10 @@ INLINE UINT32 stv_add_blend(UINT32 a, UINT32 b)
{ {
UINT32 rb = (a & 0xff00ff) + (b & 0xff00ff); UINT32 rb = (a & 0xff00ff) + (b & 0xff00ff);
UINT32 g = (a & 0x00ff00) + (b & 0x00ff00); UINT32 g = (a & 0x00ff00) + (b & 0x00ff00);
if (rb & 0x1000000) rb |= 0xff0000; return MAKE_RGB((rb & 0x1000000) ? 0xff : RGB_RED(rb),
if (g & 0x10000) g = 0xff00; (g & 0x0010000) ? 0xff : RGB_GREEN(g),
if (rb & 0x100) rb |= 0xff; (rb & 0x0000100) ? 0xff : RGB_BLUE(rb)
return (rb & 0xff00ff) | g; );
} }
static void stv_vdp2_drawgfxzoom( static void stv_vdp2_drawgfxzoom(
@ -6342,7 +6342,8 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
{ {
if ( pix & ~sprite_shadow ) if ( pix & ~sprite_shadow )
{ {
bitmap_line[x] = (bitmap_line[x] & ~0x010101) >> 1; UINT32 p = bitmap_line[x];
bitmap_line[x] = MAKE_RGB(RGB_RED(p) >> 1, RGB_GREEN(p) >> 1, RGB_BLUE(p) >> 1);
} }
} }
else else
@ -6353,7 +6354,8 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
/*shadow - in reality, we should check from what layer pixel beneath comes...*/ /*shadow - in reality, we should check from what layer pixel beneath comes...*/
if ( STV_VDP2_SDCTL & 0x3f ) if ( STV_VDP2_SDCTL & 0x3f )
{ {
bitmap_line[x] = (bitmap_line[x] & ~0x010101) >> 1; UINT32 p = bitmap_line[x];
bitmap_line[x] = MAKE_RGB(RGB_RED(p) >> 1, RGB_GREEN(p) >> 1, RGB_BLUE(p) >> 1);
} }
/* note that when shadows are disabled, "shadow" palette entries are not drawn */ /* note that when shadows are disabled, "shadow" palette entries are not drawn */
} }
@ -6432,7 +6434,8 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
{ {
if ( pix & ~sprite_shadow ) if ( pix & ~sprite_shadow )
{ {
bitmap_line[x] = (bitmap_line[x] & ~0x010101) >> 1; UINT32 p = bitmap_line[x];
bitmap_line[x] = MAKE_RGB(RGB_RED(p) >> 1, RGB_GREEN(p) >> 1, RGB_BLUE(p) >> 1);
} }
} }
else else
@ -6443,7 +6446,8 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
/*shadow - in reality, we should check from what layer pixel beneath comes...*/ /*shadow - in reality, we should check from what layer pixel beneath comes...*/
if ( STV_VDP2_SDCTL & 0x3f ) if ( STV_VDP2_SDCTL & 0x3f )
{ {
bitmap_line[x] = (bitmap_line[x] & ~0x010101) >> 1; UINT32 p = bitmap_line[x];
bitmap_line[x] = MAKE_RGB(RGB_RED(p) >> 1, RGB_GREEN(p) >> 1, RGB_BLUE(p) >> 1);
} }
/* note that when shadows are disabled, "shadow" palette entries are not drawn */ /* note that when shadows are disabled, "shadow" palette entries are not drawn */
} else if ( pix ) } else if ( pix )
@ -6584,7 +6588,8 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
{ {
if ( pix & ~sprite_shadow ) if ( pix & ~sprite_shadow )
{ {
bitmap_line[x] = (bitmap_line[x] & ~0x010101) >> 1; UINT32 p = bitmap_line[x];
bitmap_line[x] = MAKE_RGB(RGB_RED(p) >> 1, RGB_GREEN(p) >> 1, RGB_BLUE(p) >> 1);
} }
} }
else else
@ -6595,7 +6600,8 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
/*shadow - in reality, we should check from what layer pixel beneath comes...*/ /*shadow - in reality, we should check from what layer pixel beneath comes...*/
if ( STV_VDP2_SDCTL & 0x3f ) if ( STV_VDP2_SDCTL & 0x3f )
{ {
bitmap_line[x] = (bitmap_line[x] & ~0x010101) >> 1; UINT32 p = bitmap_line[x];
bitmap_line[x] = MAKE_RGB(RGB_RED(p) >> 1, RGB_GREEN(p) >> 1, RGB_BLUE(p) >> 1);
} }
/* note that when shadows are disabled, "shadow" palette entries are not drawn */ /* note that when shadows are disabled, "shadow" palette entries are not drawn */
} else if ( pix ) } else if ( pix )