From be3960e2be7d5bcfe4f10666020d6a40897b3f18 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 24 Mar 2021 19:16:46 +0100 Subject: [PATCH] (gfx widgets) Add widgets_userdata to video_frame_info --- gfx/gfx_widgets.c | 2 +- retroarch.c | 2 ++ retroarch.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index 302fa3299a..fa45850bfa 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -1413,10 +1413,10 @@ static void INLINE gfx_widgets_font_unbind(gfx_widget_font_data_t *font_data) void gfx_widgets_frame(void *data) { size_t i; - dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)dispwidget_get_ptr(); 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; + 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; bool core_status_msg_show = video_info->core_status_msg_show; diff --git a/retroarch.c b/retroarch.c index 69b6aec73a..2582b9a7cd 100644 --- a/retroarch.c +++ b/retroarch.c @@ -31769,10 +31769,12 @@ void video_driver_build_info(video_frame_info_t *video_info) video_info->custom_vp_full_height = custom_vp->full_height; #if defined(HAVE_GFX_WIDGETS) + video_info->widgets_userdata = &p_rarch->dispwidget_st; video_info->widgets_is_paused = p_rarch->gfx_widgets_paused; video_info->widgets_is_fast_forwarding = p_rarch->gfx_widgets_fast_forward; video_info->widgets_is_rewinding = p_rarch->gfx_widgets_rewinding; #else + video_info->widgets_userdata = NULL; video_info->widgets_is_paused = false; video_info->widgets_is_fast_forwarding = false; video_info->widgets_is_rewinding = false; diff --git a/retroarch.h b/retroarch.h index 8ad14494a7..e63f980fe7 100644 --- a/retroarch.h +++ b/retroarch.h @@ -1115,6 +1115,7 @@ typedef struct video_info typedef struct video_frame_info { void *userdata; + void *widgets_userdata; int custom_vp_x; int custom_vp_y;