CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-29 22:25:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expand font_driver_bind_block

Browse Source
This commit is contained in:
twinaphex 2015-12-05 11:34:56 +01:00
parent 988162ed62
commit 44b708642c
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/font_driver.c
View File

@ -162,13 +162,14 @@ void font_driver_render_msg(void *font_data, const char *msg, const struct font_
font_ctx->render_msg(font_data ? font_data : driver->font_osd_data, msg, params); font_ctx->render_msg(font_data ? font_data : driver->font_osd_data, msg, params);
} }
void font_driver_bind_block(void *block) void font_driver_bind_block(void *font_data, void *block)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
const font_renderer_t *font_ctx = driver->font_osd_driver; const font_renderer_t *font_ctx = driver->font_osd_driver;
void *new_font_data = font_data ? font_data : driver->font_osd_data;
if (font_ctx->bind_block) if (font_ctx->bind_block)
font_ctx->bind_block(driver->font_osd_data, block); font_ctx->bind_block(new_font_data, block);
} }
void font_driver_free(void *data) void font_driver_free(void *data)

2
gfx/font_driver.h
View File

@ -65,7 +65,7 @@ bool font_driver_has_render_msg(void);
void font_driver_render_msg(void *data, const char *msg, const struct font_params *params); void font_driver_render_msg(void *data, const char *msg, const struct font_params *params);
void font_driver_bind_block(void *block); void font_driver_bind_block(void *font_data, void *block);
void font_driver_free(void *data); void font_driver_free(void *data);

2
menu/drivers/materialui.c
View File

@ -1007,7 +1007,7 @@ static void mui_free(void *data)
gfx_coord_array_free(&mui->list_block.carr); gfx_coord_array_free(&mui->list_block.carr);
font_driver_bind_block(NULL); font_driver_bind_block(NULL, NULL);
if (menu->userdata) if (menu->userdata)
free(menu->userdata); free(menu->userdata);

2
menu/drivers/xmb.c
View File

@ -2051,7 +2051,7 @@ static void xmb_free(void *data)
menu->userdata = NULL; menu->userdata = NULL;
} }
font_driver_bind_block(NULL); font_driver_bind_block(NULL, NULL);
} }
static void xmb_context_bg_destroy(xmb_handle_t *xmb) static void xmb_context_bg_destroy(xmb_handle_t *xmb)

2
menu/drivers/zarch.c
View File

@ -1142,7 +1142,7 @@ static void zarch_free(void *data)
free(menu->userdata); free(menu->userdata);
menu->userdata = NULL; menu->userdata = NULL;
font_driver_bind_block(NULL); font_driver_bind_block(NULL, NULL);
} }
static void zarch_context_bg_destroy(zui_t *zui) static void zarch_context_bg_destroy(zui_t *zui)