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

Cleanups

This commit is contained in:
twinaphex 2020-03-07 23:12:02 +01:00
parent 212f32e2fd
commit 935393b391
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/common/metal_common.m
View File

@ -292,10 +292,16 @@
{ {
@autoreleasepool @autoreleasepool
{ {
bool statistics_show = video_info->statistics_show;
#ifdef HAVE_GFX_WIDGETS
bool widgets_inited = video_info->widgets_inited;
#endif
[self _beginFrame]; [self _beginFrame];
_frameView.frameCount = frameCount; _frameView.frameCount = frameCount;
if (data && width && height) { if (data && width && height)
{
_frameView.size = CGSizeMake(width, height); _frameView.size = CGSizeMake(width, height);
[_frameView updateFrame:data pitch:pitch]; [_frameView updateFrame:data pitch:pitch];
} }
@ -318,7 +324,7 @@
} }
#endif #endif
if (video_info->statistics_show) if (statistics_show)
{ {
struct font_params *osd_params = (struct font_params *)&video_info->osd_stat_params; struct font_params *osd_params = (struct font_params *)&video_info->osd_stat_params;
@ -331,7 +337,7 @@
} }
#ifdef HAVE_GFX_WIDGETS #ifdef HAVE_GFX_WIDGETS
if (video_info->widgets_inited) if (widgets_inited)
{ {
[rce pushDebugGroup:@"menu widgets"]; [rce pushDebugGroup:@"menu widgets"];
gfx_widgets_frame(video_info); gfx_widgets_frame(video_info);

29
gfx/gfx_widgets.c
View File

@ -1453,8 +1453,15 @@ void gfx_widgets_frame(void *data)
{ {
size_t i; size_t i;
video_frame_info_t *video_info = (video_frame_info_t*)data; video_frame_info_t *video_info = (video_frame_info_t*)data;
bool framecount_show = video_info->framecount_show;
bool memory_show = video_info->memory_show;
unsigned video_width = video_info->width; unsigned video_width = video_info->width;
unsigned video_height = video_info->height; unsigned video_height = video_info->height;
bool widgets_is_paused = video_info->widgets_is_paused;
bool fps_show = video_info->fps_show;
bool widgets_is_fastforwarding = video_info->widgets_is_fast_forwarding;
bool widgets_is_rewinding = video_info->widgets_is_rewinding;
bool runloop_is_slowmotion = video_info->runloop_is_slowmotion;
int top_right_x_advance = video_width; int top_right_x_advance = video_width;
int scissor_me_timbers = 0; int scissor_me_timbers = 0;
@ -1866,9 +1873,9 @@ void gfx_widgets_frame(void *data)
} }
/* FPS Counter */ /* FPS Counter */
if ( video_info->fps_show if ( fps_show
|| video_info->framecount_show || framecount_show
|| video_info->memory_show || memory_show
) )
{ {
const char *text = *gfx_widgets_fps_text == '\0' ? "N/A" : gfx_widgets_fps_text; const char *text = *gfx_widgets_fps_text == '\0' ? "N/A" : gfx_widgets_fps_text;
@ -1901,24 +1908,24 @@ void gfx_widgets_frame(void *data)
} }
/* Indicators */ /* Indicators */
if (video_info->widgets_is_paused) if (widgets_is_paused)
top_right_x_advance -= gfx_widgets_draw_indicator(video_info, top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
gfx_widgets_icons_textures[MENU_WIDGETS_ICON_PAUSED], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance, gfx_widgets_icons_textures[MENU_WIDGETS_ICON_PAUSED], (fps_show ? simple_widget_height : 0), top_right_x_advance,
MSG_PAUSED); MSG_PAUSED);
if (video_info->widgets_is_fast_forwarding) if (widgets_is_fastforwarding)
top_right_x_advance -= gfx_widgets_draw_indicator(video_info, top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
gfx_widgets_icons_textures[MENU_WIDGETS_ICON_FAST_FORWARD], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance, gfx_widgets_icons_textures[MENU_WIDGETS_ICON_FAST_FORWARD], (fps_show ? simple_widget_height : 0), top_right_x_advance,
MSG_PAUSED); MSG_PAUSED);
if (video_info->widgets_is_rewinding) if (widgets_is_rewinding)
top_right_x_advance -= gfx_widgets_draw_indicator(video_info, top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
gfx_widgets_icons_textures[MENU_WIDGETS_ICON_REWIND], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance, gfx_widgets_icons_textures[MENU_WIDGETS_ICON_REWIND], (fps_show ? simple_widget_height : 0), top_right_x_advance,
MSG_REWINDING); MSG_REWINDING);
if (video_info->runloop_is_slowmotion) if (runloop_is_slowmotion)
top_right_x_advance -= gfx_widgets_draw_indicator(video_info, top_right_x_advance -= gfx_widgets_draw_indicator(video_info,
gfx_widgets_icons_textures[MENU_WIDGETS_ICON_SLOW_MOTION], (video_info->fps_show ? simple_widget_height : 0), top_right_x_advance, gfx_widgets_icons_textures[MENU_WIDGETS_ICON_SLOW_MOTION], (fps_show ? simple_widget_height : 0), top_right_x_advance,
MSG_SLOW_MOTION); MSG_SLOW_MOTION);
/* Screenshot */ /* Screenshot */

3
menu/menu_driver.c
View File

@ -2103,7 +2103,8 @@ const char *menu_driver_ident(void)
void menu_driver_frame(video_frame_info_t *video_info) void menu_driver_frame(video_frame_info_t *video_info)
{ {
if (video_info->menu_is_alive && menu_driver_ctx->frame) bool menu_is_alive = video_info->menu_is_alive;
if (menu_is_alive && menu_driver_ctx->frame)
menu_driver_ctx->frame(menu_userdata, video_info); menu_driver_ctx->frame(menu_userdata, video_info);
} }