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

Cut down on dependencies on driver->font_osd_driver

Browse Source
This commit is contained in:
twinaphex 2015-12-05 11:48:06 +01:00
parent 1c1ac91221
commit 7246d219b6
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/drivers/materialui.c
View File

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

4
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(driver->font_osd_driver, &xmb->raster_block);
menu_display_font_bind_block(&xmb->raster_block);
xmb->raster_block.carr.coords.vertices = 0;
@ -1792,7 +1792,7 @@ static void xmb_frame(void)
xmb_frame_horizontal_list(xmb, menu, width, height, &item_color[0]);
menu_display_font_flush_block(driver->font_osd_driver);
menu_display_font_flush_block();
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb);

4
menu/drivers/zarch.c
View File

@ -1009,7 +1009,7 @@ static void zarch_frame(void)
zui->tmp_block.carr.coords.vertices = 0;
menu_display_font_bind_block(driver->font_osd_driver, &zui->tmp_block);
menu_display_font_bind_block(&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);
@ -1062,7 +1062,7 @@ static void zarch_frame(void)
NULL, menu_display_get_tex_coords(), 4,
MENU_DISPLAY_PRIM_TRIANGLESTRIP);
menu_display_font_flush_block(driver->font_osd_driver);
menu_display_font_flush_block();
zui->rendering = false;

16
menu/menu_display.c
View File

@ -143,30 +143,28 @@ static bool menu_display_font_init_first(void **font_handle,
font_path, font_size);
}
bool menu_display_font_bind_block(const void *font_data, void *userdata)
bool menu_display_font_bind_block(void *userdata)
{
const struct font_renderer *font_driver =
(const struct font_renderer*)font_data;
menu_display_t *disp = menu_display_get_ptr();
if (!disp || !font_driver || !font_driver->bind_block)
if (!disp)
return false;
font_driver->bind_block(disp->font.buf, userdata);
font_driver_bind_block(disp->font.buf, userdata);
return true;
}
bool menu_display_font_flush_block(const void *font_data)
bool menu_display_font_flush_block(void)
{
const struct font_renderer *font_driver =
(const struct font_renderer*)font_data;
driver_t *driver = driver_get_ptr();
menu_display_t *disp = menu_display_get_ptr();
const struct font_renderer *font_driver = driver->font_osd_driver;
if (!font_driver || !font_driver->flush || !disp || !disp->font.buf)
return false;
font_driver->flush(disp->font.buf);
return menu_display_font_bind_block(font_driver, NULL);
return menu_display_font_bind_block(NULL);
}
void menu_display_free_main_font(void)

4
menu/menu_display.h
View File

@ -118,9 +118,9 @@ void menu_display_free(void);
bool menu_display_init(void);
bool menu_display_font_bind_block(const void *font_data, void *userdata);
bool menu_display_font_bind_block(void *userdata);
bool menu_display_font_flush_block(const void *font_data);
bool menu_display_font_flush_block(void);
bool menu_display_init_main_font(void *data,
const char *font_path, float font_size);