mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-27 16:31:47 +02:00
parent 70ffe1c12e
commit 09ddd9ddcf
5 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/drivers/materialui.c
View File

@ -1254,8 +1254,8 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
&highlighted_entry_color[0]
);
menu_display_font_bind_block(mui->font, &mui->raster_block);
menu_display_font_bind_block(mui->font2, &mui->raster_block2);
font_driver_bind_block(mui->font, &mui->raster_block);
font_driver_bind_block(mui->font2, &mui->raster_block2);
if (menu_display_get_update_pending())
mui_render_menu_list(
@ -1268,8 +1268,12 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
&active_tab_marker_color[0]
);
menu_display_font_flush_block(video_info->width, video_info->height, mui->font);
menu_display_font_flush_block(video_info->width, video_info->height, mui->font2);
font_driver_flush(video_info->width, video_info->height, mui->font);
font_driver_bind_block(mui->font, NULL);
font_driver_flush(video_info->width, video_info->height, mui->font2);
font_driver_bind_block(mui->font2, NULL);
menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
/* header */

11
menu/drivers/xmb.c
View File

@ -2680,8 +2680,8 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
title_msg[0] = '\0';
title_truncated[0] = '\0';
menu_display_font_bind_block(xmb->font, &xmb->raster_block);
menu_display_font_bind_block(xmb->font2, &xmb->raster_block2);
font_driver_bind_block(xmb->font, &xmb->raster_block);
font_driver_bind_block(xmb->font2, &xmb->raster_block2);
xmb->raster_block.carr.coords.vertices = 0;
xmb->raster_block2.carr.coords.vertices = 0;
@ -2940,8 +2940,11 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
width,
height);
menu_display_font_flush_block(video_info->width, video_info->height, xmb->font);
menu_display_font_flush_block(video_info->width, video_info->height, xmb->font2);
font_driver_flush(video_info->width, video_info->height, xmb->font);
font_driver_bind_block(xmb->font, NULL);
font_driver_flush(video_info->width, video_info->height, xmb->font2);
font_driver_bind_block(xmb->font2, NULL);
if (xmb->savestate_thumbnail)
xmb_draw_thumbnail(menu_disp_info,

7
menu/drivers/zarch.c
View File

@ -905,7 +905,7 @@ static void zarch_frame(void *data, video_frame_info_t *video_info)
zui->tmp_block.carr.coords.vertices = 0;
menu_display_font_bind_block((font_data_t*)zui->font, &zui->tmp_block);
font_driver_bind_block(zui->font, &zui->tmp_block);
menu_display_push_quad(zui->width, zui->height, zui_bg_screen,
0, 0, zui->width, zui->height);
@ -983,8 +983,9 @@ static void zarch_frame(void *data, video_frame_info_t *video_info)
zui->rendering = false;
menu_display_font_flush_block(video_info->width, video_info->height,
(font_data_t*)zui->font);
font_driver_flush(video_info->width, video_inof->height, zui->font);
font_driver_bind_block(zui->font, NULL);
menu_display_unset_viewport(video_info->width, video_info->height);
}

13
menu/menu_driver.c
View File

@ -308,19 +308,6 @@ font_data_t *menu_display_font(enum application_special_type type, float font_si
return menu_display_font_main_init(&font_info, is_threaded);
}
void menu_display_font_bind_block(font_data_t *font, void *block)
{
font_driver_bind_block(font, block);
}
bool menu_display_font_flush_block(unsigned width, unsigned height,
font_data_t *font)
{
font_driver_flush(width, height, font);
font_driver_bind_block(font, NULL);
return true;
}
void menu_display_coords_array_reset(void)
{
menu_disp_ca.coords.vertices = 0;

2
menu/menu_driver.h
View File

@ -594,8 +594,6 @@ void menu_display_blend_begin(void);
void menu_display_blend_end(void);
void menu_display_font_free(font_data_t *font);
void menu_display_font_bind_block(font_data_t *font, void *block);
bool menu_display_font_flush_block(unsigned width, unsigned height, font_data_t *font);
void menu_display_coords_array_reset(void);
video_coord_array_t *menu_display_get_coords_array(void);