ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of video_info->frame_count

This commit is contained in:
twinaphex 2017-04-23 19:21:12 +02:00
parent bf7616cf0e
commit 2dfe441381
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/video_driver.c
View File

@ -2064,13 +2064,8 @@ void video_driver_frame(const void *data, unsigned width,
video_driver_build_info(&video_info); video_driver_build_info(&video_info);
video_driver_threaded_lock();
video_info.frame_count = video_driver_frame_count;
video_driver_frame_count++;
video_driver_threaded_unlock();
/* Get the amount of frames per seconds. */ /* Get the amount of frames per seconds. */
if (video_info.frame_count) if (video_driver_frame_count)
{ {
unsigned write_index = unsigned write_index =
video_driver_frame_time_count++ & video_driver_frame_time_count++ &
@ -2078,7 +2073,7 @@ void video_driver_frame(const void *data, unsigned width,
video_driver_frame_time_samples[write_index] = new_time - fps_time; video_driver_frame_time_samples[write_index] = new_time - fps_time;
fps_time = new_time; fps_time = new_time;
if ((video_info.frame_count % FPS_UPDATE_INTERVAL) == 0) if ((video_driver_frame_count % FPS_UPDATE_INTERVAL) == 0)
{ {
char frames_text[64]; char frames_text[64];
@ -2107,7 +2102,7 @@ void video_driver_frame(const void *data, unsigned width,
snprintf(frames_text, snprintf(frames_text,
sizeof(frames_text), sizeof(frames_text),
STRING_REP_UINT64, STRING_REP_UINT64,
(unsigned long long)video_info.frame_count); (unsigned long long)video_driver_frame_count);
strlcat(video_driver_window_title, strlcat(video_driver_window_title,
frames_text, frames_text,
@ -2123,7 +2118,7 @@ void video_driver_frame(const void *data, unsigned width,
"FPS: %6.1f || %s: " STRING_REP_UINT64, "FPS: %6.1f || %s: " STRING_REP_UINT64,
last_fps, last_fps,
msg_hash_to_str(MSG_FRAMES), msg_hash_to_str(MSG_FRAMES),
(unsigned long long)video_info.frame_count); (unsigned long long)video_driver_frame_count);
} }
else else
{ {
@ -2175,10 +2170,12 @@ void video_driver_frame(const void *data, unsigned width,
if (!current_video || !current_video->frame( if (!current_video || !current_video->frame(
video_driver_data, data, width, height, video_driver_data, data, width, height,
video_info.frame_count, video_driver_frame_count,
(unsigned)pitch, video_driver_msg, &video_info)) (unsigned)pitch, video_driver_msg, &video_info))
video_driver_active = false; video_driver_active = false;
video_driver_frame_count++;
if (video_info.fps_show) if (video_info.fps_show)
runloop_msg_queue_push(video_info.fps_text, 1, 1, false); runloop_msg_queue_push(video_info.fps_text, 1, 1, false);
} }
@ -2267,7 +2264,6 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->font_msg_color_g = settings->video.msg_color_g; video_info->font_msg_color_g = settings->video.msg_color_g;
video_info->font_msg_color_b = settings->video.msg_color_b; video_info->font_msg_color_b = settings->video.msg_color_b;
video_info->frame_count = 0;
video_info->fps_text[0] = '\0'; video_info->fps_text[0] = '\0';
video_info->width = video_driver_width; video_info->width = video_driver_width;

1
gfx/video_driver.h
View File

@ -128,7 +128,6 @@ typedef struct video_frame_info
unsigned monitor_index; unsigned monitor_index;
bool font_enable; bool font_enable;
char fps_text[128]; char fps_text[128];
uint64_t frame_count;
unsigned width; unsigned width;
unsigned height; unsigned height;