Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-24 23:05:32 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[SNES]: Fixed a blending bug involving main/sub color maths

Browse Source
This commit is contained in:
Angelo Salese 2009-08-14 17:27:04 +00:00
parent ca26eac6e8
commit c9e2503f70
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mame/video/snes.c
View File

@ -152,6 +152,7 @@ INLINE void snes_draw_blend(UINT16 offset, UINT16 *colour, UINT8 mode, UINT8 cli
(clip == SNES_CLIP_OUT && snes_ppu.clipmasks[5][offset]) ) (clip == SNES_CLIP_OUT && snes_ppu.clipmasks[5][offset]) )
{ {
UINT16 r, g, b; UINT16 r, g, b;
if( mode == SNES_BLEND_ADD ) if( mode == SNES_BLEND_ADD )
{ {
if( snes_ppu.sub_add_mode ) /* Subscreen*/ if( snes_ppu.sub_add_mode ) /* Subscreen*/
@ -159,7 +160,7 @@ INLINE void snes_draw_blend(UINT16 offset, UINT16 *colour, UINT8 mode, UINT8 cli
r = (*colour & 0x1f) + (scanlines[SUBSCREEN].buffer[offset] & 0x1f); r = (*colour & 0x1f) + (scanlines[SUBSCREEN].buffer[offset] & 0x1f);
g = ((*colour & 0x3e0) >> 5) + ((scanlines[SUBSCREEN].buffer[offset] & 0x3e0) >> 5); g = ((*colour & 0x3e0) >> 5) + ((scanlines[SUBSCREEN].buffer[offset] & 0x3e0) >> 5);
b = ((*colour & 0x7c00) >> 10) + ((scanlines[SUBSCREEN].buffer[offset] & 0x7c00) >> 10); b = ((*colour & 0x7c00) >> 10) + ((scanlines[SUBSCREEN].buffer[offset] & 0x7c00) >> 10);
if( (snes_ram[CGADSUB] & 0x40) && (scanlines[SUBSCREEN].zbuf[offset]) ) /* FIXME: We shouldn't halve for the back colour */ if( (snes_ram[CGADSUB] & 0x40) && (scanlines[SUBSCREEN].buffer[offset]) ) /* FIXME: We shouldn't halve for the back colour */
{ {
r >>= 1; r >>= 1;
g >>= 1; g >>= 1;
@ -193,7 +194,7 @@ INLINE void snes_draw_blend(UINT16 offset, UINT16 *colour, UINT8 mode, UINT8 cli
if( r > 0x1f ) r = 0; if( r > 0x1f ) r = 0;
if( g > 0x1f ) g = 0; if( g > 0x1f ) g = 0;
if( b > 0x1f ) b = 0; if( b > 0x1f ) b = 0;
if( (snes_ram[CGADSUB] & 0x40) && (scanlines[SUBSCREEN].zbuf[offset]) ) /* FIXME: We shouldn't halve for the back colour */ if( (snes_ram[CGADSUB] & 0x40) && (scanlines[SUBSCREEN].buffer[offset]) ) /* FIXME: We shouldn't halve for the back colour */
{ {
r >>= 1; r >>= 1;
g >>= 1; g >>= 1;