mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of some pointer grabbing for disp_get_ptr by making it

Browse Source 
a part of video_frame_info
This commit is contained in:
twinaphex 2021-04-05 14:54:55 +02:00
parent 115b08e0e1
commit af00dca08b
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/gfx_widgets.c
View File

@ -1583,9 +1583,9 @@ static void INLINE gfx_widgets_font_unbind(gfx_widget_font_data_t *font_data)
void gfx_widgets_frame(void *data)
{
size_t i;
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx= p_disp->dispctx;
video_frame_info_t *video_info = (video_frame_info_t*)data;
gfx_display_t *p_disp = (gfx_display_t*)video_info->disp_userdata;
gfx_display_ctx_driver_t *dispctx= p_disp->dispctx;
dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)video_info->widgets_userdata;
bool framecount_show = video_info->framecount_show;
bool memory_show = video_info->memory_show;

2
menu/drivers/ozone/ozone.c
View File

@ -2897,7 +2897,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
bool input_menu_swap_ok_cancel_buttons = video_info->input_menu_swap_ok_cancel_buttons;
bool battery_level_enable = video_info->battery_level_enable;
bool timedate_enable = video_info->timedate_enable;
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_t *p_disp = (gfx_display_t*)video_info->disp_userdata;;
gfx_animation_t *p_anim = anim_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;

2
menu/drivers/xmb.c
View File

@ -4700,7 +4700,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
bool libretro_running = video_info->libretro_running;
unsigned menu_shader_pipeline = video_info->menu_shader_pipeline;
float menu_wallpaper_opacity = video_info->menu_wallpaper_opacity;
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_t *p_disp = (gfx_display_t*)video_info->disp_userdata;
gfx_animation_t *p_anim = anim_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
bool input_dialog_display_kb = menu_input_dialog_get_display_kb();

1
retroarch.c
View File

@ -31999,6 +31999,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->input_driver_nonblock_state = p_rarch->input_driver_nonblock_state;
video_info->input_driver_grab_mouse_state = p_rarch->input_driver_grab_mouse_state;
video_info->disp_userdata = &p_rarch->dispgfx;
video_info->userdata = VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch);

1
retroarch.h
View File

@ -1116,6 +1116,7 @@ typedef struct video_frame_info
{
void *userdata;
void *widgets_userdata;
void *disp_userdata;
int custom_vp_x;
int custom_vp_y;