Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Renamed *_vbl_cb to *_vblank_callback.

Browse Source 
Fixed 01475: Screenless systems are broken because of a vblank callback.
We now create an artificial update mechanism when there are no screens.
This commit is contained in:
Aaron Giles 2008-03-14 05:19:53 +00:00
parent 13f82f7331
commit 8fcd45cab1
6 changed files with 71 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpuexec.c
View File

@ -964,7 +964,7 @@ static void cpu_inittimers(running_machine *machine)
assert(screen != NULL);
video_screen_register_vbl_cb(screen, on_vblank);
video_screen_register_vblank_callback(screen, on_vblank);
}
/* periodic interrupts */

2
src/emu/crsshair.c
View File

@ -207,7 +207,7 @@ void crosshair_init(running_machine *machine)
/* register the animation callback */
if (machine->primary_screen != NULL)
video_screen_register_vbl_cb(machine->primary_screen, animate);
video_screen_register_vblank_callback(machine->primary_screen, animate);
}

2
src/emu/debug/debugcpu.c
View File

@ -297,7 +297,7 @@ void debug_cpu_init(running_machine *machine)
/* add callback for breaking on VBLANK */
if (machine->primary_screen != NULL)
video_screen_register_vbl_cb(machine->primary_screen, on_vblank);
video_screen_register_vblank_callback(machine->primary_screen, on_vblank);
add_exit_callback(machine, debug_cpu_exit);
}

109
src/emu/video.c
View File

@ -36,8 +36,8 @@
#define SUBSECONDS_PER_SPEED_UPDATE (ATTOSECONDS_PER_SECOND / 4)
#define PAUSED_REFRESH_RATE (30)
#define MAX_VBL_CB (10)
#define DEFAULT_FRAME_PEIOD ATTOTIME_IN_HZ(60)
#define MAX_VBLANK_CALLBACKS (10)
#define DEFAULT_FRAME_PERIOD ATTOTIME_IN_HZ(60)
@ -76,7 +76,7 @@ struct _screen_state
UINT64 frame_number; /* the current frame number */
/* screen specific VBLANK callbacks */
vblank_state_changed_func vbl_cbs[MAX_VBL_CB]; /* the array of callbacks */
vblank_state_changed_func vblank_callback[MAX_VBLANK_CALLBACKS]; /* the array of callbacks */
/* movie recording */
mame_file * movie_file; /* handle to the open movie file */
@ -87,46 +87,49 @@ struct _screen_state
typedef struct _video_global video_global;
struct _video_global
{
/* screenless systems */
emu_timer * screenless_frame_timer; /* timer to signal VBLANK start */
/* throttling calculations */
osd_ticks_t throttle_last_ticks;/* osd_ticks the last call to throttle */
attotime throttle_realtime; /* real time the last call to throttle */
attotime throttle_emutime; /* emulated time the last call to throttle */
UINT32 throttle_history; /* history of frames where we were fast enough */
osd_ticks_t throttle_last_ticks; /* osd_ticks the last call to throttle */
attotime throttle_realtime; /* real time the last call to throttle */
attotime throttle_emutime; /* emulated time the last call to throttle */
UINT32 throttle_history; /* history of frames where we were fast enough */
/* dynamic speed computation */
osd_ticks_t speed_last_realtime;/* real time at the last speed calculation */
attotime speed_last_emutime; /* emulated time at the last speed calculation */
double speed_percent; /* most recent speed percentage */
osd_ticks_t speed_last_realtime; /* real time at the last speed calculation */
attotime speed_last_emutime; /* emulated time at the last speed calculation */
double speed_percent; /* most recent speed percentage */
UINT32 partial_updates_this_frame;/* partial update counter this frame */
/* overall speed computation */
UINT32 overall_real_seconds;/* accumulated real seconds at normal speed */
osd_ticks_t overall_real_ticks; /* accumulated real ticks at normal speed */
attotime overall_emutime; /* accumulated emulated time at normal speed */
UINT32 overall_valid_counter;/* number of consecutive valid time periods */
UINT32 overall_real_seconds; /* accumulated real seconds at normal speed */
osd_ticks_t overall_real_ticks; /* accumulated real ticks at normal speed */
attotime overall_emutime; /* accumulated emulated time at normal speed */
UINT32 overall_valid_counter; /* number of consecutive valid time periods */
/* configuration */
UINT8 sleep; /* flag: TRUE if we're allowed to sleep */
UINT8 throttle; /* flag: TRUE if we're currently throttled */
UINT8 fastforward; /* flag: TRUE if we're currently fast-forwarding */
UINT32 seconds_to_run; /* number of seconds to run before quitting */
UINT8 auto_frameskip; /* flag: TRUE if we're automatically frameskipping */
UINT32 speed; /* overall speed (*100) */
UINT32 original_speed; /* originally-specified speed */
UINT8 refresh_speed; /* flag: TRUE if we max out our speed according to the refresh */
UINT8 update_in_pause; /* flag: TRUE if video is updated while in pause */
UINT8 sleep; /* flag: TRUE if we're allowed to sleep */
UINT8 throttle; /* flag: TRUE if we're currently throttled */
UINT8 fastforward; /* flag: TRUE if we're currently fast-forwarding */
UINT32 seconds_to_run; /* number of seconds to run before quitting */
UINT8 auto_frameskip; /* flag: TRUE if we're automatically frameskipping */
UINT32 speed; /* overall speed (*100) */
UINT32 original_speed; /* originally-specified speed */
UINT8 refresh_speed; /* flag: TRUE if we max out our speed according to the refresh */
UINT8 update_in_pause; /* flag: TRUE if video is updated while in pause */
/* frameskipping */
UINT8 empty_skip_count; /* number of empty frames we have skipped */
UINT8 frameskip_level; /* current frameskip level */
UINT8 frameskip_counter; /* counter that counts through the frameskip steps */
UINT8 empty_skip_count; /* number of empty frames we have skipped */
UINT8 frameskip_level; /* current frameskip level */
UINT8 frameskip_counter; /* counter that counts through the frameskip steps */
INT8 frameskip_adjust;
UINT8 skipping_this_frame;/* flag: TRUE if we are skipping the current frame */
osd_ticks_t average_oversleep; /* average number of ticks the OSD oversleeps */
UINT8 skipping_this_frame; /* flag: TRUE if we are skipping the current frame */
osd_ticks_t average_oversleep; /* average number of ticks the OSD oversleeps */
/* snapshot stuff */
render_target * snap_target; /* screen shapshot target */
bitmap_t * snap_bitmap; /* screen snapshot bitmap */
render_target * snap_target; /* screen shapshot target */
bitmap_t * snap_bitmap; /* screen snapshot bitmap */
};
@ -172,6 +175,7 @@ static void decode_graphics(running_machine *machine, const gfx_decode_entry *gf
/* global rendering */
static TIMER_CALLBACK( vblank_begin_callback );
static TIMER_CALLBACK( vblank_end_callback );
static TIMER_CALLBACK( screenless_update_callback );
static TIMER_CALLBACK( scanline0_callback );
static TIMER_CALLBACK( scanline_update_callback );
static int finish_screen_updates(running_machine *machine);
@ -356,6 +360,13 @@ void video_init(running_machine *machine)
if (machine->config->video_attributes & VIDEO_UPDATE_SCANLINE)
timer_adjust_oneshot(state->scanline_timer, video_screen_get_time_until_pos(screen, 0, 0), 0);
}
/* if no screens, create a periodic timer to drive updates */
if (video_screen_count(machine->config) == 0)
{
global.screenless_frame_timer = timer_alloc(screenless_update_callback, NULL);
timer_adjust_periodic(global.screenless_frame_timer, DEFAULT_FRAME_PERIOD, 0, DEFAULT_FRAME_PERIOD);
}
}
@ -1168,7 +1179,7 @@ attotime video_screen_get_frame_period(const device_config *screen)
if (video_screen_count(screen->machine->config) == 0)
{
assert(screen == NULL);
ret = DEFAULT_FRAME_PEIOD;
ret = DEFAULT_FRAME_PERIOD;
}
else
{
@ -1194,35 +1205,35 @@ UINT64 video_screen_get_frame_number(const device_config *screen)
/*-------------------------------------------------
video_screen_register_vbl_cb - registers a
video_screen_register_vblank_callback - registers a
VBLANK callback for a specific screen
-------------------------------------------------*/
void video_screen_register_vbl_cb(const device_config *screen, vblank_state_changed_func vbl_cb)
void video_screen_register_vblank_callback(const device_config *screen, vblank_state_changed_func vblank_callback)
{
int i, found;
screen_state *state = get_safe_token(screen);
/* validate arguments */
assert(vbl_cb != NULL);
assert(vblank_callback != NULL);
/* check if we already have this callback registered */
found = FALSE;
for (i = 0; i < MAX_VBL_CB; i++)
for (i = 0; i < MAX_VBLANK_CALLBACKS; i++)
{
if (state->vbl_cbs[i] == NULL)
if (state->vblank_callback[i] == NULL)
break;
if (state->vbl_cbs[i] == vbl_cb)
if (state->vblank_callback[i] == vblank_callback)
found = TRUE;
}
/* check that there is room */
assert(i != MAX_VBL_CB);
assert(i != MAX_VBLANK_CALLBACKS);
/* if not found, register and increment count */
if (!found)
state->vbl_cbs[i] = vbl_cb;
state->vblank_callback[i] = vblank_callback;
}
@ -1305,8 +1316,8 @@ static TIMER_CALLBACK( vblank_begin_callback )
state->vblank_end_time = attotime_add_attoseconds(state->vblank_start_time, state->vblank_period);
/* call the screen specific callbacks */
for (i = 0; state->vbl_cbs[i] != NULL; i++)
state->vbl_cbs[i](screen, TRUE);
for (i = 0; state->vblank_callback[i] != NULL; i++)
(*state->vblank_callback[i])(screen, TRUE);
/* if this is the primary screen and we need to update now */
if ((screen == machine->primary_screen) && !(machine->config->video_attributes & VIDEO_UPDATE_AFTER_VBLANK))
@ -1335,8 +1346,8 @@ static TIMER_CALLBACK( vblank_end_callback )
screen_state *state = get_safe_token(screen);
/* call the screen specific callbacks */
for (i = 0; state->vbl_cbs[i] != NULL; i++)
state->vbl_cbs[i](screen, FALSE);
for (i = 0; state->vblank_callback[i] != NULL; i++)
(*state->vblank_callback[i])(screen, FALSE);
/* if this is the primary screen and we need to update now */
if ((screen == machine->primary_screen) && (machine->config->video_attributes & VIDEO_UPDATE_AFTER_VBLANK))
@ -1347,6 +1358,18 @@ static TIMER_CALLBACK( vblank_end_callback )
}
/*-------------------------------------------------
screenless_update_callback - update generator
when there are no screens to drive it
-------------------------------------------------*/
static TIMER_CALLBACK( screenless_update_callback )
{
/* force an update */
video_frame_update(machine, FALSE);
}
/*-------------------------------------------------
scanline0_callback - reset partial updates
for a screen

2
src/emu/video.h
View File

@ -153,7 +153,7 @@ attotime video_screen_get_frame_period(const device_config *screen);
UINT64 video_screen_get_frame_number(const device_config *screen);
/* registers a VBLANK callback for the given screen */
void video_screen_register_vbl_cb(const device_config *screen, vblank_state_changed_func vbl_cb);
void video_screen_register_vblank_callback(const device_config *screen, vblank_state_changed_func vblank_callback);
/* ----- video screen device interface ----- */

2
src/emu/watchdog.c
View File

@ -117,7 +117,7 @@ void watchdog_reset(running_machine *machine)
/* register a VBLANK callback for the primary screen */
if (machine->primary_screen != NULL)
video_screen_register_vbl_cb(machine->primary_screen, on_vblank);
video_screen_register_vblank_callback(machine->primary_screen, on_vblank);
}
/* timer-based watchdog? */