libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 07:59:42 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Get rid of gfx_display_draw_texture - use gfx_display_draw_quad instead

Browse Source
This commit is contained in:
twinaphex 2021-08-22 17:57:21 +02:00
parent 54ae219302
commit bea512b70b
18 changed files with 210 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gfx/gfx_display.c
View File

@ -533,7 +533,8 @@ void gfx_display_draw_quad(
unsigned video_height,
int x, int y, unsigned w, unsigned h,
unsigned width, unsigned height,
float *color)
float *color,
uintptr_t *texture)
{
gfx_display_ctx_draw_t draw;
struct video_coords coords;
@ -557,7 +558,7 @@ void gfx_display_draw_quad(
draw.height = h;
draw.coords = &coords;
draw.matrix_data = NULL;
draw.texture = gfx_display_white_texture;
draw.texture = (texture != NULL) ? *texture : gfx_display_white_texture;
draw.prim_type = GFX_DISPLAY_PRIM_TRIANGLESTRIP;
draw.pipeline_id = 0;
draw.scale_factor = 1.0f;
@ -628,52 +629,6 @@ void gfx_display_draw_polygon(
dispctx->blend_end(userdata);
}
static void gfx_display_draw_texture(
gfx_display_t *p_disp,
void *data,
unsigned video_width,
unsigned video_height,
int x, int y, unsigned w, unsigned h,
unsigned width, unsigned height,
float *color,uintptr_t *texture
)
{
gfx_display_ctx_draw_t draw;
struct video_coords coords;
gfx_display_ctx_driver_t
*dispctx = p_disp->dispctx;
if (w == 0 || h == 0)
return;
if (!dispctx)
return;
coords.vertices = 4;
coords.vertex = NULL;
coords.tex_coord = NULL;
coords.lut_tex_coord = NULL;
coords.color = color;
draw.x = x;
draw.y = (int)height - y - (int)h;
draw.width = w;
draw.height = h;
draw.coords = &coords;
draw.matrix_data = NULL;
draw.texture = (texture != NULL) ? *texture : gfx_display_white_texture;
draw.prim_type = GFX_DISPLAY_PRIM_TRIANGLESTRIP;
draw.pipeline_id = 0;
draw.scale_factor = 1.0f;
draw.rotation = 0.0f;
if (dispctx->blend_begin)
dispctx->blend_begin(data);
if (dispctx->draw)
dispctx->draw(&draw, data, video_width, video_height);
if (dispctx->blend_end)
dispctx->blend_end(data);
}
/* Draw the texture split into 9 sections, without scaling the corners.
* The middle sections will only scale in the X axis, and the side
* sections will only scale in the Y axis. */
@ -1217,7 +1172,8 @@ void gfx_display_draw_keyboard(
video_height / 2.0,
video_width,
video_height,
&osk_dark[0]);
&osk_dark[0],
NULL);
ptr_width = video_width / 11;
ptr_height = video_height / 10;
@ -1240,7 +1196,7 @@ void gfx_display_draw_keyboard(
if (dispctx && dispctx->blend_begin)
dispctx->blend_begin(userdata);
gfx_display_draw_texture(
gfx_display_draw_quad(
p_disp,
userdata,
video_width,

3
gfx/gfx_display.h
View File

@ -293,7 +293,8 @@ void gfx_display_draw_quad(
unsigned video_height,
int x, int y, unsigned w, unsigned h,
unsigned width, unsigned height,
float *color);
float *color,
uintptr_t *texture);
void gfx_display_draw_polygon(
gfx_display_t *p_disp,

30
gfx/gfx_widgets.c
View File

@ -1193,7 +1193,8 @@ static int gfx_widgets_draw_indicator(
top_right_x_advance - width, y,
width, height,
video_width, video_height,
p_dispwidget->backdrop_orig
p_dispwidget->backdrop_orig,
NULL
);
gfx_display_set_alpha(p_dispwidget->pure_white, 1.0f);
@ -1229,7 +1230,8 @@ static int gfx_widgets_draw_indicator(
top_right_x_advance - width, y,
width, height,
video_width, video_height,
p_dispwidget->backdrop_orig
p_dispwidget->backdrop_orig,
NULL
);
gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular,
@ -1327,7 +1329,8 @@ static void gfx_widgets_draw_task_msg(
rect_x, rect_y,
rect_width, rect_height,
video_width, video_height,
msg_queue_current_background
msg_queue_current_background,
NULL
);
/* Progress bar */
@ -1346,7 +1349,8 @@ static void gfx_widgets_draw_task_msg(
p_dispwidget->msg_queue_task_rect_start_x, video_height - msg->offset_y,
bar_width, rect_height,
video_width, video_height,
msg_queue_current_bar
msg_queue_current_bar,
NULL
);
}
@ -1512,7 +1516,8 @@ static void gfx_widgets_draw_regular_msg(
p_dispwidget->msg_queue_height,
video_width,
video_height,
p_dispwidget->msg_queue_bg
p_dispwidget->msg_queue_bg,
NULL
);
/* Text */
@ -1671,7 +1676,8 @@ void gfx_widgets_frame(void *data)
p_dispwidget->divider_width_1px,
video_width,
video_height,
outline_color
outline_color,
NULL
);
/* bottom line */
gfx_display_draw_quad(
@ -1684,7 +1690,8 @@ void gfx_widgets_frame(void *data)
p_dispwidget->divider_width_1px,
video_width,
video_height,
outline_color
outline_color,
NULL
);
/* left line */
gfx_display_draw_quad(
@ -1698,7 +1705,8 @@ void gfx_widgets_frame(void *data)
video_height,
video_width,
video_height,
outline_color
outline_color,
NULL
);
/* right line */
gfx_display_draw_quad(
@ -1711,7 +1719,8 @@ void gfx_widgets_frame(void *data)
video_height,
video_width,
video_height,
outline_color
outline_color,
NULL
);
if (p_dispwidget->ai_service_overlay_state == 2)
@ -1755,7 +1764,8 @@ void gfx_widgets_frame(void *data)
p_dispwidget->simple_widget_height,
video_width,
video_height,
p_dispwidget->backdrop_orig
p_dispwidget->backdrop_orig,
NULL
);
gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular,

6
gfx/widgets/gfx_widget_achievement_popup.c
View File

@ -146,7 +146,8 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
state->height,
state->height,
video_width, video_height,
p_dispwidget->backdrop_orig);
p_dispwidget->backdrop_orig,
NULL);
/* Icon */
if (p_dispwidget->gfx_widgets_icons_textures[MENU_WIDGETS_ICON_ACHIEVEMENT])
@ -212,7 +213,8 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
state->height,
video_width,
video_height,
p_dispwidget->backdrop_orig);
p_dispwidget->backdrop_orig,
NULL);
/* Title */
gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular,

12
gfx/widgets/gfx_widget_generic_message.c
View File

@ -474,7 +474,8 @@ static void gfx_widget_generic_message_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
state->bg_color);
state->bg_color,
NULL);
/* Frame */
@ -490,7 +491,8 @@ static void gfx_widget_generic_message_frame(void *data, void *user_data)
state->frame_width,
video_width,
video_height,
state->frame_color);
state->frame_color,
NULL);
/* > Left */
gfx_display_draw_quad(
@ -504,7 +506,8 @@ static void gfx_widget_generic_message_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
state->frame_color);
state->frame_color,
NULL);
/* > Right */
gfx_display_draw_quad(
@ -518,7 +521,8 @@ static void gfx_widget_generic_message_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
state->frame_color);
state->frame_color,
NULL);
/* Message */
gfx_widgets_draw_text(

3
gfx/widgets/gfx_widget_leaderboard_display.c
View File

@ -134,7 +134,8 @@ static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)
video_width, video_height,
(int)x, (int)y, widget_width, widget_height,
video_width, video_height,
p_dispwidget->backdrop_orig);
p_dispwidget->backdrop_orig,
NULL);
/* Text */
gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular,

9
gfx/widgets/gfx_widget_libretro_message.c
View File

@ -412,7 +412,8 @@ static void gfx_widget_libretro_message_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
bg_color);
bg_color,
NULL);
/* Frame */
gfx_display_draw_quad(
@ -426,7 +427,8 @@ static void gfx_widget_libretro_message_frame(void *data, void *user_data)
state->frame_width,
video_width,
video_height,
state->frame_color);
state->frame_color,
NULL);
gfx_display_draw_quad(
p_disp,
@ -439,7 +441,8 @@ static void gfx_widget_libretro_message_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
state->frame_color);
state->frame_color,
NULL);
}
/* Draw text */

21
gfx/widgets/gfx_widget_load_content_animation.c
View File

@ -737,7 +737,8 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
video_height,
video_width,
video_height,
state->bg_underlay_color);
state->bg_underlay_color,
NULL);
/* > Background shadow */
gfx_display_draw_quad(
@ -751,7 +752,8 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
state->bg_shadow_height,
video_width,
video_height,
state->bg_shadow_top_color);
state->bg_shadow_top_color,
NULL);
gfx_display_draw_quad(
p_disp,
@ -764,7 +766,8 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
state->bg_shadow_height,
video_width,
video_height,
state->bg_shadow_bottom_color);
state->bg_shadow_bottom_color,
NULL);
/* > Background */
gfx_display_draw_quad(
@ -778,7 +781,8 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
state->bg_color);
state->bg_color,
NULL);
}
/* Draw icon */
@ -822,7 +826,8 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
state->icon_size,
video_width,
video_height,
state->icon_color);
state->icon_color,
NULL);
}
/* Draw text */
@ -906,7 +911,8 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
state->margin_shadow_left_color);
state->margin_shadow_left_color,
NULL);
/* > Right */
gfx_display_draw_quad(
@ -920,7 +926,8 @@ static void gfx_widget_load_content_animation_frame(void *data, void *user_data)
state->bg_height,
video_width,
video_height,
state->margin_shadow_right_color);
state->margin_shadow_right_color,
NULL);
}
}
}

9
gfx/widgets/gfx_widget_progress_message.c
View File

@ -251,7 +251,8 @@ static void gfx_widget_progress_message_frame(void *data, void *user_data)
state->widget_height,
video_width,
video_height,
backdrop_color);
backdrop_color,
NULL);
/* Draw progress bar background */
gfx_display_set_alpha(state->bar_bg_color, state->alpha);
@ -267,7 +268,8 @@ static void gfx_widget_progress_message_frame(void *data, void *user_data)
state->bar_bg_height,
video_width,
video_height,
state->bar_bg_color);
state->bar_bg_color,
NULL);
/* Draw progress bar */
if (state->progress >= 0)
@ -292,7 +294,8 @@ static void gfx_widget_progress_message_frame(void *data, void *user_data)
state->bar_height,
video_width,
video_height,
bar_color);
bar_color,
NULL);
/* Draw message text */
gfx_widgets_draw_text(

6
gfx/widgets/gfx_widget_screenshot.c
View File

@ -227,7 +227,8 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data)
0, state->y,
state->width, state->height,
video_width, video_height,
p_dispwidget->backdrop_orig
p_dispwidget->backdrop_orig,
NULL
);
gfx_display_set_alpha(pure_white, 1.0f);
@ -282,7 +283,8 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data)
0, 0,
video_width, video_height,
video_width, video_height,
pure_white
pure_white,
NULL
);
}
}

9
gfx/widgets/gfx_widget_volume.c
View File

@ -180,7 +180,8 @@ static void gfx_widget_volume_frame(void* data, void *user_data)
state->widget_height,
video_width,
video_height,
backdrop_orig
backdrop_orig,
NULL
);
/* Icon */
@ -233,7 +234,8 @@ static void gfx_widget_volume_frame(void* data, void *user_data)
bar_x + bar_percentage * bar_width, bar_y,
bar_width - bar_percentage * bar_width, bar_height,
video_width, video_height,
bar_background
bar_background,
NULL
);
gfx_display_draw_quad(
@ -244,7 +246,8 @@ static void gfx_widget_volume_frame(void* data, void *user_data)
bar_x, bar_y,
bar_percentage * bar_width, bar_height,
video_width, video_height,
bar_foreground
bar_foreground,
NULL
);
/* Text */

93
menu/drivers/materialui.c
View File

@ -2475,7 +2475,8 @@ static void materialui_draw_thumbnail(
(unsigned)bg_height,
video_width,
video_height,
mui->colors.thumbnail_background);
mui->colors.thumbnail_background,
NULL);
/* Icon */
gfx_display_set_alpha(
@ -2532,7 +2533,8 @@ static void materialui_draw_thumbnail(
(unsigned)(bg_height + 1.5f),
video_width,
video_height,
mui->colors.thumbnail_background);
mui->colors.thumbnail_background,
NULL);
}
/* Thumbnail */
@ -2646,7 +2648,8 @@ static void materialui_render_messagebox(
mui->font_data.list.line_height * list.size + mui->margin * 4.0,
video_width,
video_height,
mui->colors.surface_background);
mui->colors.surface_background,
NULL);
/* Print each line of the message */
for (i = 0; i < list.size; i++)
@ -4481,7 +4484,8 @@ static void materialui_render_menu_entry_playlist_list(
mui->entry_divider_width,
video_width,
video_height,
mui->colors.entry_divider);
mui->colors.entry_divider,
NULL);
}
/* Used for playlist 'dual icon' entries
@ -4638,7 +4642,8 @@ static void materialui_render_menu_entry_playlist_dual_icon(
mui->entry_divider_width,
video_width,
video_height,
mui->colors.entry_divider);
mui->colors.entry_divider,
NULL);
}
/* Used for playlist 'desktop'-layout entries
@ -4737,7 +4742,8 @@ static void materialui_render_menu_entry_playlist_desktop(
mui->entry_divider_width,
video_width,
video_height,
mui->colors.entry_divider);
mui->colors.entry_divider,
NULL);
}
static void (*materialui_render_menu_entry)(
@ -4808,7 +4814,8 @@ static void materialui_render_selected_entry_aux_playlist_desktop(
(unsigned)background_height,
video_width,
video_height,
mui->colors.side_bar_background);
mui->colors.side_bar_background,
NULL);
/* > Divider */
gfx_display_draw_quad(
@ -4822,7 +4829,8 @@ static void materialui_render_selected_entry_aux_playlist_desktop(
(unsigned)background_height,
video_width,
video_height,
mui->colors.entry_divider);
mui->colors.entry_divider,
NULL);
/* > Additional divider */
if (mui->landscape_optimization.enabled)
@ -4837,7 +4845,8 @@ static void materialui_render_selected_entry_aux_playlist_desktop(
(unsigned)background_height,
video_width,
video_height,
mui->colors.entry_divider);
mui->colors.entry_divider,
NULL);
/* Draw thumbnails */
if (node)
@ -4921,7 +4930,8 @@ static void materialui_render_selected_entry_aux_playlist_desktop(
mui->status_bar.height,
video_width,
video_height,
mui->colors.status_bar_background);
mui->colors.status_bar_background,
NULL);
/* > Shadow
* (For symmetry, header and status bar
@ -4937,7 +4947,8 @@ static void materialui_render_selected_entry_aux_playlist_desktop(
mui->header_shadow_height,
video_width,
video_height,
mui->colors.status_bar_shadow);
mui->colors.status_bar_shadow,
NULL);
/* Text */
if ((text_width > 0) && !string_is_empty(mui->status_bar.str))
@ -5033,7 +5044,8 @@ static void materialui_render_scrollbar(
mui->scrollbar.height,
video_width,
video_height,
mui->colors.scrollbar);
mui->colors.scrollbar,
NULL);
}
/* Draws current menu list */
@ -5242,7 +5254,8 @@ static void materialui_render_landscape_border(
border_height,
video_width,
video_height,
mui->colors.landscape_border_shadow_left);
mui->colors.landscape_border_shadow_left,
NULL);
/* Draw right border */
gfx_display_draw_quad(
@ -5256,7 +5269,8 @@ static void materialui_render_landscape_border(
border_height,
video_width,
video_height,
mui->colors.landscape_border_shadow_right);
mui->colors.landscape_border_shadow_right,
NULL);
}
}
@ -5308,7 +5322,8 @@ static void materialui_render_selection_highlight(
(unsigned)highlight_height,
video_width,
video_height,
highlight_color);
highlight_color,
NULL);
/* Draw shadow, if required */
if (mui->show_selection_marker_shadow)
@ -5324,7 +5339,8 @@ static void materialui_render_selection_highlight(
mui->selection_marker_shadow_height,
video_width,
video_height,
shadow_top_colour);
shadow_top_colour,
NULL);
gfx_display_draw_quad(
p_disp,
@ -5338,7 +5354,8 @@ static void materialui_render_selection_highlight(
mui->selection_marker_shadow_height,
video_width,
video_height,
shadow_bottom_colour);
shadow_bottom_colour,
NULL);
}
}
}
@ -5485,7 +5502,8 @@ static void materialui_render_header(
mui->header_shadow_height,
video_width,
video_height,
mui->colors.header_shadow);
mui->colors.header_shadow,
NULL);
/* > Title bar background */
gfx_display_draw_quad(
@ -5499,7 +5517,8 @@ static void materialui_render_header(
mui->sys_bar_height + mui->title_bar_height,
video_width,
video_height,
mui->colors.title_bar_background);
mui->colors.title_bar_background,
NULL);
/* > System bar background */
gfx_display_draw_quad(
@ -5513,7 +5532,8 @@ static void materialui_render_header(
mui->sys_bar_height,
video_width,
video_height,
mui->colors.sys_bar_background);
mui->colors.sys_bar_background,
NULL);
/* System bar items */
@ -5890,7 +5910,8 @@ static void materialui_render_nav_bar_bottom(
nav_bar_height,
video_width,
video_height,
mui->colors.nav_bar_background);
mui->colors.nav_bar_background,
NULL);
/* > Divider */
gfx_display_draw_quad(
@ -5904,7 +5925,8 @@ static void materialui_render_nav_bar_bottom(
mui->nav_bar.divider_width,
video_width,
video_height,
mui->colors.divider);
mui->colors.divider,
NULL);
/* Draw tabs */
@ -5968,7 +5990,8 @@ static void materialui_render_nav_bar_bottom(
selection_marker_height,
video_width,
video_height,
draw_color);
draw_color,
NULL);
}
}
@ -6005,7 +6028,8 @@ static void materialui_render_nav_bar_right(
nav_bar_height,
video_width,
video_height,
mui->colors.nav_bar_background);
mui->colors.nav_bar_background,
NULL);
/* > Divider */
gfx_display_draw_quad(
@ -6019,7 +6043,8 @@ static void materialui_render_nav_bar_right(
nav_bar_height,
video_width,
video_height,
mui->colors.divider);
mui->colors.divider,
NULL);
/* Draw tabs */
@ -6083,7 +6108,8 @@ static void materialui_render_nav_bar_right(
selection_marker_height,
video_width,
video_height,
draw_color);
draw_color,
NULL);
}
}
@ -6497,7 +6523,8 @@ static void materialui_render_fullscreen_thumbnails(
(unsigned)view_height,
video_width,
video_height,
mui->colors.screen_fade);
mui->colors.screen_fade,
NULL);
/* Draw thumbnails
* > Primary */
@ -6517,7 +6544,8 @@ static void materialui_render_fullscreen_thumbnails(
(unsigned)primary_thumbnail_draw_height + mui->margin,
video_width,
video_height,
mui->colors.surface_background);
mui->colors.surface_background,
NULL);
/* Thumbnail */
gfx_thumbnail_draw(
@ -6552,7 +6580,8 @@ static void materialui_render_fullscreen_thumbnails(
(unsigned)secondary_thumbnail_draw_height + mui->margin,
video_width,
video_height,
mui->colors.surface_background);
mui->colors.surface_background,
NULL);
/* Thumbnail */
gfx_thumbnail_draw(
@ -6920,7 +6949,8 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
0, 0,
video_width, video_height,
video_width, video_height,
mui->colors.screen_fade);
mui->colors.screen_fade,
NULL);
/* Draw message box */
snprintf(msg, sizeof(msg), "%s\n%s", label, str);
@ -6960,7 +6990,8 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
0, 0,
video_width, video_height,
video_width, video_height,
mui->colors.screen_fade);
mui->colors.screen_fade,
NULL);
/* Draw message box */
materialui_render_messagebox(mui,

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

@ -2211,7 +2211,8 @@ static void ozone_draw_header(
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme->header_footer_separator);
ozone->theme->header_footer_separator,
NULL);
/* Title */
if (use_smooth_ticker)
@ -2474,7 +2475,8 @@ static void ozone_draw_footer(
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme->header_footer_separator);
ozone->theme->header_footer_separator,
NULL);
/* Buttons */
@ -3027,8 +3029,8 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
video_height,
0, 0, video_width, video_height,
video_width, video_height,
background_color
);
background_color,
NULL);
/* Header, footer */
ozone_draw_header(

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

@ -180,7 +180,8 @@ static void ozone_draw_cursor_fallback(
height - ozone->dimensions.spacer_3px,
video_width,
video_height,
ozone->theme_dynamic.selection);
ozone->theme_dynamic.selection,
NULL);
/* Borders (can't do one single quad because of alpha) */
@ -196,7 +197,8 @@ static void ozone_draw_cursor_fallback(
ozone->dimensions.spacer_3px,
video_width,
video_height,
ozone->theme_dynamic.selection_border);
ozone->theme_dynamic.selection_border,
NULL);
/* Bottom */
gfx_display_draw_quad(
@ -210,7 +212,8 @@ static void ozone_draw_cursor_fallback(
ozone->dimensions.spacer_3px,
video_width,
video_height,
ozone->theme_dynamic.selection_border);
ozone->theme_dynamic.selection_border,
NULL);
/* Left */
gfx_display_draw_quad(
@ -224,7 +227,8 @@ static void ozone_draw_cursor_fallback(
height - ozone->dimensions.spacer_3px,
video_width,
video_height,
ozone->theme_dynamic.selection_border);
ozone->theme_dynamic.selection_border,
NULL);
/* Right */
gfx_display_draw_quad(
@ -238,7 +242,8 @@ static void ozone_draw_cursor_fallback(
height - ozone->dimensions.spacer_3px,
video_width,
video_height,
ozone->theme_dynamic.selection_border);
ozone->theme_dynamic.selection_border,
NULL);
}
@ -379,7 +384,8 @@ void ozone_draw_backdrop(
video_height,
video_width,
video_height,
ozone_backdrop);
ozone_backdrop,
NULL);
}
void ozone_draw_osk(ozone_handle_t *ozone,
@ -429,7 +435,8 @@ void ozone_draw_osk(ozone_handle_t *ozone,
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme->entries_border);
ozone->theme->entries_border,
NULL);
/* Bottom */
gfx_display_draw_quad(
@ -443,7 +450,8 @@ void ozone_draw_osk(ozone_handle_t *ozone,
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme->entries_border);
ozone->theme->entries_border,
NULL);
/* Left */
gfx_display_draw_quad(
@ -457,7 +465,8 @@ void ozone_draw_osk(ozone_handle_t *ozone,
bottom_end - margin*2,
video_width,
video_height,
ozone->theme->entries_border);
ozone->theme->entries_border,
NULL);
/* Right */
gfx_display_draw_quad(
@ -471,7 +480,8 @@ void ozone_draw_osk(ozone_handle_t *ozone,
bottom_end - margin*2,
video_width,
video_height,
ozone->theme->entries_border);
ozone->theme->entries_border,
NULL);
/* Backdrop */
/* TODO: Remove the backdrop if blur shader is available */
@ -486,7 +496,8 @@ void ozone_draw_osk(ozone_handle_t *ozone,
bottom_end - margin*2 - ozone->dimensions.spacer_2px,
video_width,
video_height,
ozone_osk_backdrop);
ozone_osk_backdrop,
NULL);
/* Placeholder & text*/
if (draw_placeholder)
@ -549,7 +560,8 @@ void ozone_draw_osk(ozone_handle_t *ozone,
ozone->fonts.entries_label.line_ascender,
video_width,
video_height,
ozone->pure_white);
ozone->pure_white,
NULL);
}
}
else
@ -894,7 +906,8 @@ void ozone_draw_fullscreen_thumbnails(
(unsigned)view_height,
width,
height,
background_color);
background_color,
NULL);
/* Draw full-width separators */
gfx_display_draw_quad(
@ -908,7 +921,8 @@ void ozone_draw_fullscreen_thumbnails(
ozone->dimensions.spacer_1px,
width,
height,
separator_color);
separator_color,
NULL);
gfx_display_draw_quad(
p_disp,
@ -921,7 +935,8 @@ void ozone_draw_fullscreen_thumbnails(
ozone->dimensions.spacer_1px,
width,
height,
separator_color);
separator_color,
NULL);
/* Draw thumbnails */
@ -942,7 +957,8 @@ void ozone_draw_fullscreen_thumbnails(
(unsigned)right_thumbnail_draw_height + (frame_width << 1),
width,
height,
frame_color);
frame_color,
NULL);
/* Thumbnail */
gfx_thumbnail_draw(
@ -977,7 +993,8 @@ void ozone_draw_fullscreen_thumbnails(
(unsigned)left_thumbnail_draw_height + (frame_width << 1),
width,
height,
frame_color);
frame_color,
NULL);
/* Thumbnail */
gfx_thumbnail_draw(

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

@ -600,7 +600,8 @@ void ozone_draw_entries(
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme_dynamic.entries_border);
ozone->theme_dynamic.entries_border,
NULL);
gfx_display_draw_quad(
p_disp,
userdata,
@ -612,7 +613,8 @@ void ozone_draw_entries(
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme_dynamic.entries_border);
ozone->theme_dynamic.entries_border,
NULL);
border_iterate:
if (node)
@ -985,7 +987,8 @@ void ozone_draw_thumbnail_bar(
ozone->dimensions.sidebar_gradient_height,
video_width,
video_height,
ozone->theme->sidebar_top_gradient);
ozone->theme->sidebar_top_gradient,
NULL);
gfx_display_draw_quad(
p_disp,
userdata,
@ -997,7 +1000,8 @@ void ozone_draw_thumbnail_bar(
sidebar_height,
video_width,
video_height,
ozone->theme->sidebar_background);
ozone->theme->sidebar_background,
NULL);
gfx_display_draw_quad(
p_disp,
userdata,
@ -1009,7 +1013,8 @@ void ozone_draw_thumbnail_bar(
ozone->dimensions.sidebar_gradient_height + ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme->sidebar_bottom_gradient);
ozone->theme->sidebar_bottom_gradient,
NULL);
}
/* Thumbnails */
@ -1238,7 +1243,8 @@ void ozone_draw_thumbnail_bar(
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme_dynamic.entries_border);
ozone->theme_dynamic.entries_border,
NULL);
y += 18 * scale_factor;

12
menu/drivers/ozone/ozone_sidebar.c
View File

@ -234,7 +234,8 @@ void ozone_draw_sidebar(
ozone->dimensions.sidebar_gradient_height,
video_width,
video_height,
ozone->theme->sidebar_top_gradient);
ozone->theme->sidebar_top_gradient,
NULL);
gfx_display_draw_quad(
p_disp,
userdata,
@ -246,7 +247,8 @@ void ozone_draw_sidebar(
sidebar_height,
video_width,
video_height,
ozone->theme->sidebar_background);
ozone->theme->sidebar_background,
NULL);
gfx_display_draw_quad(
p_disp,
userdata,
@ -262,7 +264,8 @@ void ozone_draw_sidebar(
+ ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme->sidebar_bottom_gradient);
ozone->theme->sidebar_bottom_gradient,
NULL);
}
/* Tabs */
@ -395,7 +398,8 @@ void ozone_draw_sidebar(
ozone->dimensions.spacer_1px,
video_width,
video_height,
ozone->theme->entries_border);
ozone->theme->entries_border,
NULL);
y += ozone->dimensions.sidebar_entry_padding_vertical + ozone->dimensions.spacer_1px;

12
menu/drivers/xmb.c
View File

@ -4600,7 +4600,8 @@ static void xmb_draw_fullscreen_thumbnails(
(unsigned)view_height,
(unsigned)view_width,
(unsigned)view_height,
background_color);
background_color,
NULL);
/* Draw header */
if (show_header)
@ -4617,7 +4618,8 @@ static void xmb_draw_fullscreen_thumbnails(
(unsigned)(header_height - frame_width),
(unsigned)view_width,
(unsigned)view_height,
header_color);
header_color,
NULL);
/* Title text */
if (menu_ticker_smooth)
@ -4712,7 +4714,8 @@ static void xmb_draw_fullscreen_thumbnails(
(unsigned)right_thumbnail_draw_height + (frame_width << 1),
(unsigned)view_width,
(unsigned)view_height,
frame_color);
frame_color,
NULL);
/* Thumbnail */
gfx_thumbnail_draw(
@ -4747,7 +4750,8 @@ static void xmb_draw_fullscreen_thumbnails(
(unsigned)left_thumbnail_draw_height + (frame_width << 1),
(unsigned)view_width,
(unsigned)view_height,
frame_color);
frame_color,
NULL);
/* Thumbnail */
gfx_thumbnail_draw(

3
menu/menu_screensaver.c
View File

@ -773,7 +773,8 @@ void menu_screensaver_frame(menu_screensaver_t *screensaver,
0, 0,
screensaver->last_width, screensaver->last_height,
screensaver->last_width, screensaver->last_height,
screensaver->bg_color);
screensaver->bg_color,
NULL);
/* Draw particle effect, if required */
if ((screensaver->effect != MENU_SCREENSAVER_BLANK) &&