mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

font_driver_render_msg - make it possible to pass special font data

Browse Source
This commit is contained in:
twinaphex 2015-12-05 10:49:28 +01:00
parent c88d795734
commit e196fdf141
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/d3d/d3d.cpp
View File

@ -525,7 +525,7 @@ static void d3d_set_osd_msg(void *data, const char *msg,
if (d3d->renderchain_driver->set_font_rect && params) if (d3d->renderchain_driver->set_font_rect && params)
d3d->renderchain_driver->set_font_rect(d3d, params); d3d->renderchain_driver->set_font_rect(d3d, params);
font_driver_render_msg(msg, params); font_driver_render_msg(NULL, msg, params);
} }
/* Delay constructor due to lack of exceptions. */ /* Delay constructor due to lack of exceptions. */
@ -1509,7 +1509,7 @@ static bool d3d_frame(void *data, const void *frame,
font_parms.y = msg_height; font_parms.y = msg_height;
font_parms.scale = 21; font_parms.scale = 21;
#endif #endif
font_driver_render_msg(msg, &font_params); font_driver_render_msg(NULL, msg, &font_params);
} }
#ifdef HAVE_MENU #ifdef HAVE_MENU

15
gfx/drivers/gl.c
View File

@ -1795,7 +1795,7 @@ static bool gl_frame(void *data, const void *frame,
#endif #endif
if (msg) if (msg)
font_driver_render_msg(msg, NULL); font_driver_render_msg(NULL, msg, NULL);
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (gl->overlay_enable) if (gl->overlay_enable)
@ -3373,18 +3373,7 @@ static void gl_apply_state_changes(void *data)
static void gl_set_osd_msg(void *data, const char *msg, static void gl_set_osd_msg(void *data, const char *msg,
const struct font_params *params, void *font) const struct font_params *params, void *font)
{ {
driver_t *driver = driver_get_ptr(); font_driver_render_msg(font, msg, params);
const struct font_renderer *font_driver = driver ?
driver->font_osd_driver : NULL;
gl_t *gl = (gl_t*)data;
if (!gl)
return;
if (!font)
font = driver->font_osd_data;
if (driver->font_osd_driver && font)
font_driver->render_msg(font, msg, params);
} }
static void gl_show_mouse(void *data, bool state) static void gl_show_mouse(void *data, bool state)

2
gfx/drivers/vita2d_gfx.c
View File

@ -278,7 +278,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
} }
if(msg && strcmp(msg,"")) if(msg && strcmp(msg,""))
font_driver_render_msg(msg, NULL); font_driver_render_msg(NULL, msg, NULL);
vita2d_end_drawing(); vita2d_end_drawing();
vita2d_swap_buffers(); vita2d_swap_buffers();

4
gfx/font_driver.c
View File

@ -152,13 +152,13 @@ bool font_driver_has_render_msg(void)
return true; return true;
} }
void font_driver_render_msg(const char *msg, const struct font_params *params) void font_driver_render_msg(void *font_data, const char *msg, const struct font_params *params)
{ {
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;
if (font_ctx->render_msg) if (font_ctx->render_msg)
font_ctx->render_msg(driver->font_osd_data, msg, params); font_ctx->render_msg(font_data ? font_data : driver->font_osd_data, msg, params);
} }
void font_driver_free(void) void font_driver_free(void)

2
gfx/font_driver.h
View File

@ -63,7 +63,7 @@ bool font_init_first(
bool font_driver_has_render_msg(void); bool font_driver_has_render_msg(void);
void font_driver_render_msg(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_free(void); void font_driver_free(void);