diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 4ad24712a1..eb9f0abd3a 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -4850,9 +4850,9 @@ static void materialui_render_fullscreen_thumbnails( /* Thumbnail */ gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, primary_thumbnail, primary_thumbnail_x, primary_thumbnail_y, @@ -4884,9 +4884,9 @@ static void materialui_render_fullscreen_thumbnails( /* Thumbnail */ gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, secondary_thumbnail, secondary_thumbnail_x, secondary_thumbnail_y, @@ -5025,21 +5025,21 @@ static void materialui_update_scrollbar( * Draws all menu elements */ static void materialui_frame(void *data, video_frame_info_t *video_info) { - materialui_handle_t *mui = (materialui_handle_t*)data; - settings_t *settings = config_get_ptr(); - void *userdata = video_info->userdata; - unsigned width = video_info->width; - unsigned height = video_info->height; - unsigned video_width = video_info->width; - unsigned video_height = video_info->height; + materialui_handle_t *mui = (materialui_handle_t*)data; + settings_t *settings = config_get_ptr(); + void *userdata = video_info->userdata; + unsigned width = video_info->width; + unsigned height = video_info->height; + unsigned video_width = video_info->width; + unsigned video_height = video_info->height; unsigned materialui_color_theme = video_info->materialui_color_theme; - unsigned header_height = gfx_display_get_header_height(); - size_t selection = menu_navigation_get_selection(); + unsigned header_height = gfx_display_get_header_height(); + size_t selection = menu_navigation_get_selection(); int list_x_offset; enum gfx_animation_ticker_type - menu_ticker_type = (enum gfx_animation_ticker_type)settings->uints.menu_ticker_type; - bool menu_ticker_smooth = settings->bools.menu_ticker_smooth; + menu_ticker_type = (enum gfx_animation_ticker_type)settings->uints.menu_ticker_type; + bool menu_ticker_smooth = settings->bools.menu_ticker_smooth; if (!mui) return; diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c index fdfc500346..4a4cc8afe9 100644 --- a/menu/drivers/ozone/ozone_entries.c +++ b/menu/drivers/ozone/ozone_entries.c @@ -56,6 +56,7 @@ static void ozone_draw_entry_value(ozone_handle_t *ozone, bool switch_is_on = true; bool do_draw_text = false; float scale_factor = ozone->last_scale_factor; + void *userdata = video_info->userdata; unsigned video_width = video_info->width; unsigned video_height = video_info->height; @@ -65,9 +66,9 @@ static void ozone_draw_entry_value(ozone_handle_t *ozone, /* check icon */ if (entry->checked) { - gfx_display_blend_begin(video_info->userdata); + gfx_display_blend_begin(userdata); ozone_draw_icon(video_info, 30 * scale_factor, 30 * scale_factor, ozone->theme->textures[OZONE_THEME_TEXTURE_CHECK], x - 20 * scale_factor, y - 22 * scale_factor, video_width, video_height, 0, 1, ozone->theme_dynamic.entries_checkmark); - gfx_display_blend_end(video_info->userdata); + gfx_display_blend_end(userdata); return; } @@ -640,11 +641,11 @@ border_iterate: gfx_display_set_alpha(icon_color, alpha); - gfx_display_blend_begin(video_info->userdata); + gfx_display_blend_begin(userdata); ozone_draw_icon(video_info, ozone->dimensions.entry_icon_size, ozone->dimensions.entry_icon_size, texture, (unsigned) ozone->dimensions.sidebar_width + x_offset + entry_padding + ozone->dimensions.entry_icon_padding, y + scroll_y + ozone->dimensions.entry_height / 2 - ozone->dimensions.entry_icon_size / 2, video_width, video_height, 0, 1, icon_color); - gfx_display_blend_end(video_info->userdata); + gfx_display_blend_end(userdata); if (icon_color == ozone_pure_white) gfx_display_set_alpha(icon_color, 1.0f); @@ -712,10 +713,11 @@ static void ozone_draw_no_thumbnail_available(ozone_handle_t *ozone, { unsigned icon = OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO; unsigned icon_size = (unsigned)((float)ozone->dimensions.sidebar_entry_icon_size * 1.5f); + void *userdata = video_info->userdata; unsigned video_width = video_info->width; unsigned video_height = video_info->height; - gfx_display_blend_begin(video_info->userdata); + gfx_display_blend_begin(userdata); ozone_draw_icon(video_info, icon_size, icon_size, @@ -725,7 +727,7 @@ static void ozone_draw_no_thumbnail_available(ozone_handle_t *ozone, video_width, video_height, 0, 1, ozone->theme->entries_icon); - gfx_display_blend_end(video_info->userdata); + gfx_display_blend_end(userdata); ozone_draw_text( ozone, diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 044eb4ade8..10e96c6ce5 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -4262,9 +4262,9 @@ static void xmb_draw_fullscreen_thumbnails( /* Thumbnail */ gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, right_thumbnail, right_thumbnail_x, thumbnail_y, @@ -4296,9 +4296,9 @@ static void xmb_draw_fullscreen_thumbnails( /* Thumbnail */ gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, left_thumbnail, left_thumbnail_x, thumbnail_y, @@ -4480,9 +4480,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) float thumb_y = xmb->margins_title_top + (xmb->icon_size / 4.0f) + ((thumb_height - scaled_thumb_height) / 2.0f); gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, &xmb->thumbnails.savestate, thumb_x, thumb_y, @@ -4526,9 +4526,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) float left_thumb_y = thumb_y_base + thumb_height + (xmb->icon_size / 4) + thumb_y_offset; gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, &xmb->thumbnails.right, thumb_x, right_thumb_y, @@ -4538,9 +4538,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) 1.0f, 1.0f, &thumbnail_shadow); gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, &xmb->thumbnails.left, thumb_x, left_thumb_y, @@ -4565,9 +4565,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) float thumb_y = xmb->margins_screen_top + xmb->icon_size; gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, show_right_thumbnail ? &xmb->thumbnails.right : &xmb->thumbnails.left, thumb_x, thumb_y, @@ -4590,9 +4590,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) float thumb_y = xmb->margins_screen_top + xmb->icon_size; gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, &xmb->thumbnails.right, thumb_x, thumb_y, @@ -4614,9 +4614,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) float thumb_y = xmb->margins_screen_top + xmb->icon_size + y_offset; gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, &xmb->thumbnails.left, thumb_x, thumb_y, @@ -4646,9 +4646,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) * > Impose a minimum size limit */ if (thumb_height > xmb->icon_size) gfx_thumbnail_draw( - video_info->userdata, - video_info->width, - video_info->height, + userdata, + video_width, + video_height, show_left_thumbnail ? &xmb->thumbnails.left : &xmb->thumbnails.right, thumb_x, thumb_y,