ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change signature of get_glyph

This commit is contained in:
twinaphex 2015-03-29 22:36:30 +02:00
parent 0443624ee2
commit f3e5ed9854
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/drivers_font/gl_raster_font.c
View File

@ -140,9 +140,9 @@ static int get_message_width(gl_raster_t *font, const char *msg)
for (i = 0; i < msg_len; i++) for (i = 0; i < msg_len; i++)
{ {
const struct font_glyph *glyph = const struct font_glyph *glyph =
font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]); (const struct font_glyph*)font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]);
if (!glyph) if (!glyph)
glyph = font->font_driver->get_glyph(font->font_data, '?'); /* Do something smarter here ... */ glyph = (const struct font_glyph*)font->font_driver->get_glyph(font->font_data, '?'); /* Do something smarter here ... */
if (!glyph) if (!glyph)
continue; continue;
@ -199,9 +199,9 @@ static void render_message(gl_raster_t *font, const char *msg, GLfloat scale,
{ {
int off_x, off_y, tex_x, tex_y, width, height; int off_x, off_y, tex_x, tex_y, width, height;
const struct font_glyph *glyph = const struct font_glyph *glyph =
font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]); (const struct font_glyph*)font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]);
if (!glyph) if (!glyph)
glyph = font->font_driver->get_glyph(font->font_data, '?'); /* Do something smarter here ... */ glyph = (const struct font_glyph*)font->font_driver->get_glyph(font->font_data, '?'); /* Do something smarter here ... */
if (!glyph) if (!glyph)
continue; continue;
@ -345,7 +345,7 @@ static void gl_raster_font_render_msg(void *data, const char *msg,
restore_viewport(gl); restore_viewport(gl);
} }
static const struct font_glyph *gl_raster_font_get_glyph( static const void *gl_raster_font_get_glyph(
void *data, uint32_t code) void *data, uint32_t code)
{ {
gl_raster_t *font = (gl_raster_t*)data; gl_raster_t *font = (gl_raster_t*)data;

2
gfx/drivers_font_renderer/bitmapfont.c
View File

@ -40,7 +40,7 @@ static const struct font_atlas *font_renderer_bmp_get_atlas(void *data)
return &handle->atlas; return &handle->atlas;
} }
static const struct font_glyph *font_renderer_bmp_get_glyph( static const void *font_renderer_bmp_get_glyph(
void *data, uint32_t code) void *data, uint32_t code)
{ {
bm_renderer_t *handle = (bm_renderer_t*)data; bm_renderer_t *handle = (bm_renderer_t*)data;

2
gfx/drivers_font_renderer/coretext.c
View File

@ -45,7 +45,7 @@ static const struct font_atlas *font_renderer_ct_get_atlas(void *data)
return &handle->atlas; return &handle->atlas;
} }
static const struct font_glyph *font_renderer_ct_get_glyph(void *data, uint32_t code) static const void *font_renderer_ct_get_glyph(void *data, uint32_t code)
{ {
font_renderer_t *handle = (font_renderer_t*)data; font_renderer_t *handle = (font_renderer_t*)data;

2
gfx/drivers_font_renderer/freetype.c
View File

@ -45,7 +45,7 @@ static const struct font_atlas *font_renderer_ft_get_atlas(void *data)
return &handle->atlas; return &handle->atlas;
} }
static const struct font_glyph *font_renderer_ft_get_glyph( static const void *font_renderer_ft_get_glyph(
void *data, uint32_t code) void *data, uint32_t code)
{ {
font_renderer_t *handle = (font_renderer_t*)data; font_renderer_t *handle = (font_renderer_t*)data;

2
gfx/font_gl_driver.h
View File

@ -30,7 +30,7 @@ typedef struct gl_font_renderer
void (*render_msg)(void *data, const char *msg, const void *userdata); void (*render_msg)(void *data, const char *msg, const void *userdata);
const char *ident; const char *ident;
const struct font_glyph *(*get_glyph)(void *data, uint32_t code); const void *(*get_glyph)(void *data, uint32_t code);
void (*bind_block)(void *data, void *block); void (*bind_block)(void *data, void *block);
void (*flush)(void *data); void (*flush)(void *data);
} gl_font_renderer_t; } gl_font_renderer_t;

2
gfx/font_renderer_driver.h
View File

@ -62,7 +62,7 @@ typedef struct font_renderer_driver
const struct font_atlas *(*get_atlas)(void *data); const struct font_atlas *(*get_atlas)(void *data);
/* Returns NULL if no glyph for this code is found. */ /* Returns NULL if no glyph for this code is found. */
const struct font_glyph *(*get_glyph)(void *data, uint32_t code); const void *(*get_glyph)(void *data, uint32_t code);
void (*free)(void *data); void (*free)(void *data);