(Fonts) Change font drivers to non-constedness

This commit is contained in:
twinaphex 2014-09-12 02:24:09 +02:00
parent aa409e5e8f
commit 11e3d1e2ac
10 changed files with 11 additions and 15 deletions

View File

@ -122,7 +122,7 @@ static const char *font_renderer_get_default_font(void)
return "";
}
const font_renderer_driver_t bitmap_font_renderer = {
font_renderer_driver_t bitmap_font_renderer = {
font_renderer_init,
font_renderer_get_atlas,
font_renderer_get_glyph,

View File

@ -75,7 +75,7 @@ static void d3dfonts_w32_render_msg(void *data, const char *msg,
}
}
const d3d_font_renderer_t d3d_win32_font = {
d3d_font_renderer_t d3d_win32_font = {
d3dfonts_w32_init_font,
d3dfonts_w32_deinit_font,
d3dfonts_w32_render_msg,

View File

@ -70,8 +70,8 @@ typedef struct font_renderer_driver
const char *ident;
} font_renderer_driver_t;
extern const font_renderer_driver_t ft_font_renderer;
extern const font_renderer_driver_t bitmap_font_renderer;
extern font_renderer_driver_t ft_font_renderer;
extern font_renderer_driver_t bitmap_font_renderer;
/* font_path can be NULL for default font. */
bool font_renderer_create_default(const font_renderer_driver_t **driver,

View File

@ -209,7 +209,7 @@ static const char *ft_renderer_get_default_font(void)
return NULL;
}
const font_renderer_driver_t ft_font_renderer = {
font_renderer_driver_t ft_font_renderer = {
ft_renderer_init,
ft_renderer_get_atlas,
ft_renderer_get_glyph,
@ -217,4 +217,3 @@ const font_renderer_driver_t ft_font_renderer = {
ft_renderer_get_default_font,
"freetype",
};

View File

@ -43,4 +43,3 @@ bool gl_font_init_first(const gl_font_renderer_t **font_driver, void **font_hand
return false;
}

View File

@ -27,8 +27,8 @@ typedef struct gl_font_renderer
const char *ident;
} gl_font_renderer_t;
extern const gl_font_renderer_t gl_raster_font;
extern const gl_font_renderer_t libdbg_font;
extern gl_font_renderer_t gl_raster_font;
extern gl_font_renderer_t libdbg_font;
bool gl_font_init_first(const gl_font_renderer_t **font_driver, void **font_handle,
void *gl_data, const char *font_path, float font_size);

View File

@ -265,10 +265,9 @@ static void gl_render_msg(void *data, const char *msg,
gl_set_viewport(gl, gl->win_width, gl->win_height, false, true);
}
const gl_font_renderer_t gl_raster_font = {
gl_font_renderer_t gl_raster_font = {
gl_init_font,
gl_free_font,
gl_render_msg,
"GL raster",
};

View File

@ -94,10 +94,9 @@ static void gl_render_msg(void *data, const char *msg,
#endif
}
const gl_font_renderer_t libdbg_font = {
gl_font_renderer_t libdbg_font = {
gl_init_font,
gl_deinit_font,
gl_render_msg,
"GL raster",
};

View File

@ -69,7 +69,7 @@ static void xfonts_render_msg(void *data, const char *msg,
pFrontBuffer->Release();
}
const d3d_font_renderer_t d3d_xdk1_font = {
d3d_font_renderer_t d3d_xdk1_font = {
xfonts_init_font,
xfonts_deinit_font,
xfonts_render_msg,

View File

@ -467,7 +467,7 @@ static void xdk_render_msg(void *data, const char *str_msg,
}
}
const d3d_font_renderer_t d3d_xbox360_font = {
d3d_font_renderer_t d3d_xbox360_font = {
xdk_init_font,
xdk_deinit_font,
xdk_render_msg,