mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nothing was done with first param of menu_display_font_bind_block

Browse Source
This commit is contained in:
twinaphex 2015-12-05 11:38:18 +01:00
parent 44b708642c
commit a747af2687
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/materialui.c
View File

@ -813,7 +813,7 @@ static void mui_frame(void)
width, height,
&lightblue_bg[0]);
menu_display_font_bind_block(menu, driver->font_osd_driver, &mui->list_block);
menu_display_font_bind_block(driver->font_osd_driver, &mui->list_block);
mui_render_menu_list(mui, width, height, menu, normal_color, hover_color, &pure_white[0]);

2
menu/drivers/xmb.c
View File

@ -1699,7 +1699,7 @@ static void xmb_frame(void)
video_driver_get_size(&width, &height);
menu_display_font_bind_block(menu, font_driver, &xmb->raster_block);
menu_display_font_bind_block(font_driver, &xmb->raster_block);
xmb->raster_block.carr.coords.vertices = 0;

5
menu/drivers/zarch.c
View File

@ -968,7 +968,6 @@ static void zarch_frame(void)
float coord_color[16];
float coord_color2[16];
zui_t *zui = NULL;
const struct font_renderer *font_driver = NULL;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
@ -1010,9 +1009,7 @@ static void zarch_frame(void)
zui->tmp_block.carr.coords.vertices = 0;
font_driver = driver->font_osd_driver;
menu_display_font_bind_block(zui->menu, font_driver, &zui->tmp_block);
menu_display_font_bind_block(driver->font_osd_driver, &zui->tmp_block);
zarch_zui_push_quad(zui->width, zui->height, ZUI_BG_SCREEN, &zui->ca, 0, 0, zui->width, zui->height);
zarch_zui_snow(zui, &zui->ca, zui->width, zui->height);

6
menu/menu_display.c
View File

@ -143,7 +143,7 @@ static bool menu_display_font_init_first(void **font_handle,
font_path, font_size);
}
bool menu_display_font_bind_block(void *data, const void *font_data, void *userdata)
bool menu_display_font_bind_block(const void *font_data, void *userdata)
{
const struct font_renderer *font_driver =
(const struct font_renderer*)font_data;
@ -160,15 +160,13 @@ bool menu_display_font_flush_block(void *data, const void *font_data)
{
const struct font_renderer *font_driver =
(const struct font_renderer*)font_data;
menu_handle_t *menu = (menu_handle_t*)data;
menu_display_t *disp = menu_display_get_ptr();
if (!font_driver || !font_driver->flush || !disp || !disp->font.buf)
return false;
font_driver->flush(disp->font.buf);
return menu_display_font_bind_block(menu,
font_driver, NULL);
return menu_display_font_bind_block(font_driver, NULL);
}
void menu_display_free_main_font(void)

2
menu/menu_display.h
View File

@ -118,7 +118,7 @@ void menu_display_free(void);
bool menu_display_init(void);
bool menu_display_font_bind_block(void *data, const void *font_data, void *userdata);
bool menu_display_font_bind_block(const void *font_data, void *userdata);
bool menu_display_font_flush_block(void *data, const void *font_data);