Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SNES]: Made the gfx mode switches more accurate.

Browse Source
This commit is contained in:
Angelo Salese 2009-08-17 21:40:00 +00:00
parent 737e80bac6
commit c611d6039a
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mame/machine/snes.c
View File

@ -290,29 +290,31 @@ static TIMER_CALLBACK( snes_hblank_tick )
*************************************/
static TIMER_CALLBACK( snes_dynamic_res_change )
static void snes_dynamic_res_change( running_machine *machine )
{
rectangle visarea = *video_screen_get_visible_area(machine->primary_screen);
attoseconds_t refresh;
visarea.min_x = visarea.min_y = 0;
visarea.max_y = snes_ppu.beam.last_visible_line*snes_ppu.interlace - 1;
visarea.max_x = (SNES_SCR_WIDTH * 2) - 1;
// fixme: should compensate for SNES_DBG_video
if( snes_ppu.mode == 5 || snes_ppu.mode == 6 )
{
visarea.max_x = (SNES_SCR_WIDTH * 2) - 1;
snes_htmult = 2;
}
else
{
visarea.max_x = SNES_SCR_WIDTH - 1;
snes_htmult = 1;
}
/* FIXME: does the timing changes when the gfx mode is equal to 5 or 6? */
if ((snes_ram[STAT78] & 0x10) == SNES_NTSC)
refresh = HZ_TO_ATTOSECONDS(DOTCLK_NTSC) * SNES_HTOTAL * SNES_VTOTAL_NTSC;
else
refresh = HZ_TO_ATTOSECONDS(DOTCLK_PAL) * SNES_HTOTAL * SNES_VTOTAL_PAL;
if ((snes_ram[STAT78] & 0x10) == SNES_NTSC)
video_screen_configure(machine->primary_screen, SNES_HTOTAL*snes_htmult, SNES_VTOTAL_NTSC*snes_ppu.interlace, &visarea, video_screen_get_frame_period(machine->primary_screen).attoseconds);
video_screen_configure(machine->primary_screen, SNES_HTOTAL*2, SNES_VTOTAL_NTSC*snes_ppu.interlace, &visarea, refresh);
else
video_screen_configure(machine->primary_screen, SNES_HTOTAL*snes_htmult, SNES_VTOTAL_PAL*snes_ppu.interlace, &visarea, video_screen_get_frame_period(machine->primary_screen).attoseconds);
video_screen_configure(machine->primary_screen, SNES_HTOTAL*2, SNES_VTOTAL_PAL*snes_ppu.interlace, &visarea, refresh);
}
static READ8_HANDLER( snes_open_bus_r )
@ -785,7 +787,7 @@ WRITE8_HANDLER( snes_w_io )
}
case BGMODE: /* BG mode and character size settings */
snes_ppu.mode = data & 0x07;
timer_set(space->machine, video_screen_get_time_until_pos(space->machine->primary_screen, snes_ppu.beam.last_visible_line, 0), NULL, 0, snes_dynamic_res_change);
snes_dynamic_res_change(space->machine);
snes_ppu.bg3_priority_bit = data & 0x08;
snes_ppu.layer[0].tile_size = (data >> 4) & 0x1;
snes_ppu.layer[1].tile_size = (data >> 5) & 0x1;
@ -1155,7 +1157,7 @@ WRITE8_HANDLER( snes_w_io )
/* FIXME: We only support line count and interlace here */
snes_ppu.interlace = (data & 1) ? 2 : 1;
snes_ppu.beam.last_visible_line = (data & 0x4) ? 240 : 225;
timer_set(space->machine, video_screen_get_time_until_pos(space->machine->primary_screen, snes_ppu.beam.last_visible_line, 0), NULL, 0, snes_dynamic_res_change);
snes_dynamic_res_change(space->machine);
#ifdef SNES_DBG_REG_W
if( (data & 0x8) != (snes_ram[SETINI] & 0x8) )
mame_printf_debug( "Pseudo 512 mode: %s\n", (data & 0x8) ? "on" : "off" );

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

@ -1151,12 +1151,11 @@ static void snes_refresh_scanline( running_machine *machine, bitmap_t *bitmap, U
int x;
int fade;
struct SCANLINE *scanline;
UINT8 halve_x;
profiler_mark(PROFILER_VIDEO);
if (snes_ram[INIDISP] & 0x80) /* screen is forced blank */
for (x = 0; x < SNES_SCR_WIDTH * snes_htmult; x++)
for (x = 0; x < SNES_SCR_WIDTH * 2; x++)
*BITMAP_ADDR32(bitmap, curline, x) = RGB_BLACK;
else
{
@ -1216,28 +1215,17 @@ static void snes_refresh_scanline( running_machine *machine, bitmap_t *bitmap, U
/* Phew! Draw the line to screen */
fade = (snes_ram[INIDISP] & 0xf) + 1;
/* resolution line gets halved if we are inside mode 5/6 and the end resolution is 256 */
if(snes_htmult == 1 && (snes_ppu.mode == 5 || snes_ppu.mode == 6))
halve_x = 2;
else
halve_x = 1;
for (x = 0; x < SNES_SCR_WIDTH * snes_htmult * halve_x; x++)
for (x = 0; x < SNES_SCR_WIDTH * 2; x++)
{
int r = ((scanline->buffer[x] & 0x1f) * fade) >> 4;
int g = (((scanline->buffer[x] & 0x3e0) >> 5) * fade) >> 4;
int b = (((scanline->buffer[x] & 0x7c00) >> 10) * fade) >> 4;
if(snes_htmult == 2 && snes_ppu.mode != 5 && snes_ppu.mode != 6)
if(snes_htmult == 1)
{
*BITMAP_ADDR32(bitmap, curline, x*2+0) = MAKE_RGB(pal5bit(r), pal5bit(g), pal5bit(b));
*BITMAP_ADDR32(bitmap, curline, x*2+1) = MAKE_RGB(pal5bit(r), pal5bit(g), pal5bit(b));
}
else if(snes_htmult == 1 && (snes_ppu.mode == 5 || snes_ppu.mode == 6))
{
*BITMAP_ADDR32(bitmap, curline, x/2+0) = MAKE_RGB(pal5bit(r), pal5bit(g), pal5bit(b));
*BITMAP_ADDR32(bitmap, curline, x/2+1) = MAKE_RGB(pal5bit(r), pal5bit(g), pal5bit(b));
}
else
*BITMAP_ADDR32(bitmap, curline, x) = MAKE_RGB(pal5bit(r), pal5bit(g), pal5bit(b));
}