libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-08 15:13:24 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

No more video_info_frame dependency in gfx_thumbnail.c

Browse Source
This commit is contained in:
twinaphex 2020-03-09 02:15:44 +01:00
parent 6a0a68f8df
commit 7d4e5b8ce5
6 changed files with 166 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gfx/gfx_thumbnail.c
View File

@ -662,21 +662,22 @@ error:
* size of the thumbnail beyond the limits of the
* (width x height) rectangle (alignment + aspect
* correct scaling is preserved). Use with caution */
void gfx_thumbnail_draw(
video_frame_info_t *video_info, gfx_thumbnail_t *thumbnail,
void *userdata,
unsigned video_width,
unsigned video_height,
gfx_thumbnail_t *thumbnail,
float x, float y, unsigned width, unsigned height,
enum gfx_thumbnail_alignment alignment,
float alpha, float scale_factor,
gfx_thumbnail_shadow_t *shadow)
{
unsigned video_height;
/* Sanity check */
if (!video_info || !thumbnail ||
if (!thumbnail ||
(width < 1) || (height < 1) || (alpha <= 0.0f) || (scale_factor <= 0.0f))
return;
video_height = video_info->height;
/* Only draw thumbnail if it is available... */
if (thumbnail->status == GFX_THUMBNAIL_STATUS_AVAILABLE)
{
@ -707,7 +708,7 @@ void gfx_thumbnail_draw(
thumbnail, width, height, scale_factor,
&draw_width, &draw_height);
gfx_display_blend_begin(video_info->userdata);
gfx_display_blend_begin(userdata);
/* Perform 'rotation' step
* > Note that rotation does not actually work...
@ -727,7 +728,7 @@ void gfx_thumbnail_draw(
rotate_draw.scale_z = 1.0f;
rotate_draw.scale_enable = false;
gfx_display_rotate_z(&rotate_draw, video_info->userdata);
gfx_display_rotate_z(&rotate_draw, userdata);
/* Configure draw object
* > Note: Colour, width/height and position must
@ -832,8 +833,8 @@ void gfx_thumbnail_draw(
draw.y = shadow_y;
/* Draw shadow */
gfx_display_draw(&draw, video_info->userdata,
video_info->width, video_info->height);
gfx_display_draw(&draw, userdata,
video_width, video_height);
}
}
@ -845,8 +846,8 @@ void gfx_thumbnail_draw(
draw.y = draw_y;
/* Draw thumbnail */
gfx_display_draw(&draw, video_info->userdata,
video_info->width, video_info->height);
gfx_display_blend_end(video_info->userdata);
gfx_display_draw(&draw, userdata,
video_width, video_height);
gfx_display_blend_end(userdata);
}
}

5
gfx/gfx_thumbnail.h
View File

@ -219,7 +219,10 @@ void gfx_thumbnail_get_draw_dimensions(
* (width x height) rectangle (alignment + aspect
* correct scaling is preserved). Use with caution */
void gfx_thumbnail_draw(
video_frame_info_t *video_info, gfx_thumbnail_t *thumbnail,
void *userdata,
unsigned video_width,
unsigned video_height,
gfx_thumbnail_t *thumbnail,
float x, float y, unsigned width, unsigned height,
enum gfx_thumbnail_alignment alignment,
float alpha, float scale_factor,

150
menu/drivers/materialui.c
View File

@ -1708,7 +1708,9 @@ static void materialui_context_reset_textures(materialui_handle_t *mui)
}
static void materialui_draw_icon(
video_frame_info_t *video_info,
void *userdata,
unsigned video_width,
unsigned video_height,
unsigned icon_size,
uintptr_t texture,
float x, float y,
@ -1720,9 +1722,6 @@ static void materialui_draw_icon(
gfx_display_ctx_draw_t draw;
struct video_coords coords;
math_matrix_4x4 mymat;
void *userdata = video_info->userdata;
unsigned video_width = video_info->width;
unsigned video_height = video_info->height;
gfx_display_blend_begin(userdata);
@ -1760,8 +1759,10 @@ static void materialui_draw_icon(
static void materialui_draw_thumbnail(
materialui_handle_t *mui,
video_frame_info_t *video_info,
gfx_thumbnail_t *thumbnail,
void *userdata,
unsigned video_width,
unsigned video_height,
float x, float y,
unsigned width, unsigned height,
float scale_factor)
@ -1770,9 +1771,6 @@ static void materialui_draw_thumbnail(
float bg_y;
float bg_width;
float bg_height;
void *userdata = video_info->userdata;
unsigned video_width = video_info->width;
unsigned video_height = video_info->height;
/* Sanity check */
if (scale_factor <= 0)
@ -1814,7 +1812,10 @@ static void materialui_draw_thumbnail(
mui->colors.thumbnail_background);
/* Icon */
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
(unsigned)icon_size,
mui->textures.list[MUI_TEXTURE_IMAGE],
bg_x + (bg_width - icon_size) / 2.0f,
@ -1870,7 +1871,10 @@ static void materialui_draw_thumbnail(
/* Thumbnail */
gfx_thumbnail_draw(
video_info, thumbnail,
userdata,
video_width,
video_height,
thumbnail,
x, y, mui->thumbnail_width_max, mui->thumbnail_height_max,
GFX_THUMBNAIL_ALIGN_CENTRE,
mui->transition_alpha, scale_factor, NULL);
@ -2626,7 +2630,9 @@ enum materialui_entry_value_type materialui_get_entry_value_type(
static void materialui_render_switch_icon(
materialui_handle_t *mui,
video_frame_info_t *video_info,
void *userdata,
unsigned video_width,
unsigned video_height,
float y,
unsigned width, unsigned height, int x_offset,
bool on)
@ -2643,7 +2649,10 @@ static void materialui_render_switch_icon(
/* Draw background */
if (mui->textures.list[MUI_TEXTURE_SWITCH_BG])
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[MUI_TEXTURE_SWITCH_BG],
x,
@ -2656,7 +2665,10 @@ static void materialui_render_switch_icon(
/* Draw switch */
if (mui->textures.list[switch_texture_index])
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[switch_texture_index],
x,
@ -2673,7 +2685,9 @@ static void materialui_render_switch_icon(
* >> MUI_LIST_VIEW_DEFAULT */
static void materialui_render_menu_entry_default(
materialui_handle_t *mui,
video_frame_info_t *video_info,
void *userdata,
unsigned video_width,
unsigned video_height,
materialui_node_t *node,
menu_entry_t *entry,
bool entry_selected,
@ -2754,7 +2768,10 @@ static void materialui_render_menu_entry_default(
if (icon_texture)
{
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
(uintptr_t)icon_texture,
x_offset + (int)mui->landscape_entry_margin,
@ -2894,14 +2911,16 @@ static void materialui_render_menu_entry_default(
case MUI_ENTRY_VALUE_SWITCH_ON:
{
materialui_render_switch_icon(
mui, video_info, value_icon_y, width, height, x_offset, true);
mui, userdata, video_width,
video_height, value_icon_y, width, height, x_offset, true);
entry_value_width = mui->icon_size;
}
break;
case MUI_ENTRY_VALUE_SWITCH_OFF:
{
materialui_render_switch_icon(
mui, video_info, value_icon_y, width, height, x_offset, false);
mui, userdata, video_width,
video_height, value_icon_y, width, height, x_offset, false);
entry_value_width = mui->icon_size;
}
break;
@ -2909,7 +2928,10 @@ static void materialui_render_menu_entry_default(
{
/* Draw checkmark */
if (mui->textures.list[MUI_TEXTURE_CHECKMARK])
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[MUI_TEXTURE_CHECKMARK],
x_offset + (int)width - (int)mui->margin - (int)mui->landscape_entry_margin - (int)mui->nav_bar_layout_width - (int)mui->icon_size,
@ -2986,7 +3008,9 @@ static void materialui_render_menu_entry_default(
* >> MUI_LIST_VIEW_PLAYLIST_THUMB_LIST_LARGE */
static void materialui_render_menu_entry_playlist_list(
materialui_handle_t *mui,
video_frame_info_t *video_info,
void *userdata,
unsigned video_width,
unsigned video_height,
materialui_node_t *node,
menu_entry_t *entry,
bool entry_selected,
@ -2995,9 +3019,6 @@ static void materialui_render_menu_entry_playlist_list(
unsigned width, unsigned height,
int x_offset)
{
void *userdata = video_info->userdata;
unsigned video_width = video_info->width;
unsigned video_height = video_info->height;
const char *entry_label = NULL;
const char *entry_sublabel = NULL;
int entry_y = header_height - mui->scroll_y + node->y;
@ -3064,8 +3085,10 @@ static void materialui_render_menu_entry_playlist_list(
/* Draw primary thumbnail */
materialui_draw_thumbnail(
mui,
video_info,
&node->thumbnails.primary,
userdata,
video_width,
video_height,
(float)(x_offset + thumbnail_margin + (int)mui->landscape_entry_margin),
thumbnail_y,
width,
@ -3080,8 +3103,10 @@ static void materialui_render_menu_entry_playlist_list(
{
materialui_draw_thumbnail(
mui,
video_info,
&node->thumbnails.secondary,
userdata,
video_width,
video_height,
(float)(x_offset + (int)width - thumbnail_margin - (int)mui->landscape_entry_margin -
(int)mui->nav_bar_layout_width - (int)mui->thumbnail_width_max),
thumbnail_y,
@ -3244,8 +3269,10 @@ static void materialui_render_menu_entry_playlist_dual_icon(
/* > Primary thumbnail */
materialui_draw_thumbnail(
mui,
video_info,
&node->thumbnails.primary,
userdata,
video_width,
video_height,
(float)(x_offset + (int)mui->margin + (int)mui->landscape_entry_margin),
thumbnail_y,
width,
@ -3255,8 +3282,10 @@ static void materialui_render_menu_entry_playlist_dual_icon(
/* > Secondary thumbnail */
materialui_draw_thumbnail(
mui,
video_info,
&node->thumbnails.secondary,
userdata,
video_width,
video_height,
(float)(x_offset + (int)width - (int)mui->margin - (int)mui->landscape_entry_margin -
(int)mui->nav_bar_layout_width - (int)mui->thumbnail_width_max),
thumbnail_y,
@ -3379,6 +3408,9 @@ static void materialui_render_menu_list(
size_t first_entry;
size_t last_entry;
file_list_t *list = NULL;
void *userdata = video_info->userdata;
unsigned video_width = video_info->width;
unsigned video_height = video_info->height;
size_t entries_end = menu_entries_get_size();
unsigned header_height = gfx_display_get_header_height();
size_t selection = menu_navigation_get_selection();
@ -3433,7 +3465,9 @@ static void materialui_render_menu_list(
case MUI_LIST_VIEW_PLAYLIST_THUMB_LIST_LARGE:
materialui_render_menu_entry_playlist_list(
mui,
video_info,
userdata,
video_width,
video_height,
node,
&entry,
entry_selected,
@ -3460,7 +3494,9 @@ static void materialui_render_menu_list(
default:
materialui_render_menu_entry_default(
mui,
video_info,
userdata,
video_width,
video_height,
node,
&entry,
entry_selected,
@ -3875,7 +3911,10 @@ static void materialui_render_header(
texture_battery = mui->textures.list[MUI_TEXTURE_BATTERY_20];
}
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->sys_bar_icon_size,
(uintptr_t)texture_battery,
(int)width - (
@ -4010,7 +4049,10 @@ static void materialui_render_header(
{
menu_title_margin = mui->icon_size;
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[MUI_TEXTURE_BACK],
0,
@ -4027,7 +4069,10 @@ static void materialui_render_header(
/* > Draw 'search' icon, if required */
if (show_search_icon)
{
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[MUI_TEXTURE_SEARCH],
(int)width - (int)mui->icon_size - (int)mui->nav_bar_layout_width,
@ -4046,7 +4091,10 @@ static void materialui_render_header(
* 'search' is also shown... */
if (show_switch_view_icon)
{
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[MUI_TEXTURE_SWITCH_VIEW],
(int)width - (2 * (int)mui->icon_size) - (int)mui->nav_bar_layout_width,
@ -4196,7 +4244,10 @@ static void materialui_render_nav_bar_bottom(
/* Draw tabs */
/* > Back - left hand side */
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[mui->nav_bar.back_tab.texture_index],
(int)((0.5f * tab_width) - ((float)mui->icon_size / 2.0f)),
@ -4209,7 +4260,10 @@ static void materialui_render_nav_bar_bottom(
mui->colors.nav_bar_icon_passive : mui->colors.nav_bar_icon_disabled);
/* > Resume - right hand side */
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[mui->nav_bar.resume_tab.texture_index],
(int)((((float)num_tabs - 0.5f) * tab_width) - ((float)mui->icon_size / 2.0f)),
@ -4229,7 +4283,10 @@ static void materialui_render_nav_bar_bottom(
mui->colors.nav_bar_icon_active : mui->colors.nav_bar_icon_passive;
/* Draw icon */
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[tab->texture_index],
(((float)i + 1.5f) * tab_width) - ((float)mui->icon_size / 2.0f),
@ -4305,7 +4362,10 @@ static void materialui_render_nav_bar_right(
/* Draw tabs */
/* > Back - bottom */
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[mui->nav_bar.back_tab.texture_index],
nav_bar_x,
@ -4318,7 +4378,10 @@ static void materialui_render_nav_bar_right(
mui->colors.nav_bar_icon_passive : mui->colors.nav_bar_icon_disabled);
/* > Resume - top */
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[mui->nav_bar.resume_tab.texture_index],
nav_bar_x,
@ -4338,7 +4401,10 @@ static void materialui_render_nav_bar_right(
mui->colors.nav_bar_icon_active : mui->colors.nav_bar_icon_passive;
/* Draw icon */
materialui_draw_icon(video_info,
materialui_draw_icon(
userdata,
video_width,
video_height,
mui->icon_size,
mui->textures.list[tab->texture_index],
nav_bar_x,
@ -4784,7 +4850,9 @@ static void materialui_render_fullscreen_thumbnails(
/* Thumbnail */
gfx_thumbnail_draw(
video_info,
video_info->userdata,
video_info->width,
video_info->height,
primary_thumbnail,
primary_thumbnail_x,
primary_thumbnail_y,
@ -4816,7 +4884,9 @@ static void materialui_render_fullscreen_thumbnails(
/* Thumbnail */
gfx_thumbnail_draw(
video_info,
video_info->userdata,
video_info->width,
video_info->height,
secondary_thumbnail,
secondary_thumbnail_x,
secondary_thumbnail_y,

8
menu/drivers/ozone/ozone_display.c
View File

@ -814,7 +814,9 @@ void ozone_draw_fullscreen_thumbnails(
/* Thumbnail */
gfx_thumbnail_draw(
video_info,
userdata,
video_width,
video_height,
right_thumbnail,
right_thumbnail_x,
thumbnail_y,
@ -846,7 +848,9 @@ void ozone_draw_fullscreen_thumbnails(
/* Thumbnail */
gfx_thumbnail_draw(
video_info,
userdata,
video_width,
video_height,
left_thumbnail,
left_thumbnail_x,
thumbnail_y,

8
menu/drivers/ozone/ozone_entries.c
View File

@ -859,7 +859,9 @@ void ozone_draw_thumbnail_bar(ozone_handle_t *ozone, video_frame_info_t *video_i
ozone->dimensions.sidebar_entry_icon_padding;
gfx_thumbnail_draw(
video_info,
userdata,
video_width,
video_height,
&ozone->thumbnails.right,
(float)thumbnail_x_position,
(float)right_thumbnail_y_position,
@ -887,7 +889,9 @@ void ozone_draw_thumbnail_bar(ozone_handle_t *ozone, video_frame_info_t *video_i
if (show_right_thumbnail && show_left_thumbnail)
{
gfx_thumbnail_draw(
video_info,
userdata,
video_width,
video_height,
&ozone->thumbnails.left,
(float)thumbnail_x_position,
(float)left_thumbnail_y_position,

36
menu/drivers/xmb.c
View File

@ -4262,7 +4262,9 @@ static void xmb_draw_fullscreen_thumbnails(
/* Thumbnail */
gfx_thumbnail_draw(
video_info,
video_info->userdata,
video_info->width,
video_info->height,
right_thumbnail,
right_thumbnail_x,
thumbnail_y,
@ -4294,7 +4296,9 @@ static void xmb_draw_fullscreen_thumbnails(
/* Thumbnail */
gfx_thumbnail_draw(
video_info,
video_info->userdata,
video_info->width,
video_info->height,
left_thumbnail,
left_thumbnail_x,
thumbnail_y,
@ -4476,7 +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,
video_info->userdata,
video_info->width,
video_info->height,
&xmb->thumbnails.savestate,
thumb_x,
thumb_y,
@ -4520,7 +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,
video_info->userdata,
video_info->width,
video_info->height,
&xmb->thumbnails.right,
thumb_x,
right_thumb_y,
@ -4530,7 +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,
video_info->userdata,
video_info->width,
video_info->height,
&xmb->thumbnails.left,
thumb_x,
left_thumb_y,
@ -4555,7 +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,
video_info->userdata,
video_info->width,
video_info->height,
show_right_thumbnail ? &xmb->thumbnails.right : &xmb->thumbnails.left,
thumb_x,
thumb_y,
@ -4578,7 +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,
video_info->userdata,
video_info->width,
video_info->height,
&xmb->thumbnails.right,
thumb_x,
thumb_y,
@ -4600,7 +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,
video_info->userdata,
video_info->width,
video_info->height,
&xmb->thumbnails.left,
thumb_x,
thumb_y,
@ -4630,7 +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,
video_info->userdata,
video_info->width,
video_info->height,
show_left_thumbnail ? &xmb->thumbnails.left : &xmb->thumbnails.right,
thumb_x,
thumb_y,