mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 16:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start implementing frame_time/frame_count to video_info

Browse Source
This commit is contained in:
twinaphex 2018-03-23 13:30:30 +01:00
parent 85d3be1245
commit 0ece3d8397
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/video_driver.c
View File

@ -2341,7 +2341,7 @@ void video_driver_frame(const void *data, unsigned width,
video_frame_info_t video_info;
static retro_time_t curr_time;
static retro_time_t fps_time;
static float last_fps;
static float last_fps, frame_time;
unsigned output_width = 0;
unsigned output_height = 0;
unsigned output_pitch = 0;
@ -2382,6 +2382,7 @@ void video_driver_frame(const void *data, unsigned width,
video_driver_frame_time_count++ &
(MEASURE_FRAME_TIME_SAMPLES_COUNT - 1);
video_driver_frame_time_samples[write_index] = new_time - fps_time;
frame_time = new_time - fps_time;
fps_time = new_time;
if (video_driver_frame_count == 1)
@ -2390,10 +2391,10 @@ void video_driver_frame(const void *data, unsigned width,
if ((video_driver_frame_count % FPS_UPDATE_INTERVAL) == 0)
{
char frames_text[64];
last_fps = TIME_TO_FPS(curr_time, new_time, FPS_UPDATE_INTERVAL);
if (video_info.fps_show)
{
last_fps = TIME_TO_FPS(curr_time, new_time, FPS_UPDATE_INTERVAL);
snprintf(video_info.fps_text, sizeof(video_info.fps_text),
"|| FPS: %6.1f ", last_fps);
if (video_info.framecount_show)
@ -2456,6 +2457,10 @@ void video_driver_frame(const void *data, unsigned width,
video_driver_window_title_update = true;
}
video_info.frame_rate = last_fps;
video_info.frame_time = frame_time / 1000.0f;
video_info.frame_count = (uint64_t) video_driver_frame_count;
/* Slightly messy code,
* but we really need to do processing before blocking on VSync
* for best possible scheduling.

5
gfx/video_driver.h
View File

@ -450,6 +450,11 @@ typedef struct video_frame_info
float xmb_alpha_factor;
char fps_text[128];
uint64_t frame_count;
float frame_time;
float frame_rate;
void (*cb_update_window_title)(void*, void *);
void (*cb_swap_buffers)(void*, void *);
bool (*cb_get_metrics)(void *data, enum display_metric_types type,

2
menu/cbs/menu_cbs_ok.c
View File

@ -2875,7 +2875,7 @@ static int action_ok_reset_core_association(const char *path,
playlist_get_index(tmp_playlist,
rpl_entry_selection_ptr, &tmp_path, NULL, NULL, NULL, NULL, NULL);
if (!command_event(CMD_EVENT_RESET_CORE_ASSOCIATION, (void *)rpl_entry_selection_ptr))
if (!command_event(CMD_EVENT_RESET_CORE_ASSOCIATION, (void *)&rpl_entry_selection_ptr))
return menu_cbs_exit();
return 0;
}