Change font_d3d_driver.h

gfx/drivers_font/d3d_w32_font.cpp

@@ -46,7 +46,7 @@ static bool d3dfonts_w32_init_font(void *data,
    return SUCCEEDED(D3DXCreateFontIndirect(d3d->dev, &desc, &d3d_font));
 }
 
-static void d3dfonts_w32_deinit_font(void *data)
+static void d3dfonts_w32_free_font(void *data)
 {
    (void)data;
 
@@ -87,7 +87,7 @@ static void d3dfonts_w32_render_msg(void *data, const char *msg,
 
 d3d_font_renderer_t d3d_win32_font = {
    d3dfonts_w32_init_font,
-   d3dfonts_w32_deinit_font,
+   d3dfonts_w32_free_font,
    d3dfonts_w32_render_msg,
    "d3d-fonts-w32",
 };

gfx/drivers_font/ps_libdbgfont.c

@@ -55,7 +55,7 @@ static void *libdbg_font_init_font(void *gl_data, const char *font_path, float f
    return (void*)-1;
 }
 
-static void libdbg_font_deinit_font(void *data)
+static void libdbg_font_free_font(void *data)
 {
    (void)data;
    DbgFontExit();
@@ -100,7 +100,7 @@ static void libdbg_font_render_msg(void *data, const char *msg,
 
 gl_font_renderer_t libdbg_font = {
    libdbg_font_init_font,
-   libdbg_font_deinit_font,
+   libdbg_font_free_font,
    libdbg_font_render_msg,
    "GL raster",
 };

gfx/drivers_font/xdk1_xfonts.c

@@ -37,7 +37,7 @@ static bool xfonts_init_font(void *data,
    return true;
 }
 
-static void xfonts_deinit_font(void *data)
+static void xfonts_free_font(void *data)
 {
    (void)data;
 }
@@ -72,7 +72,7 @@ static void xfonts_render_msg(void *data, const char *msg,
 
 d3d_font_renderer_t d3d_xdk1_font = {
    xfonts_init_font,
-   xfonts_deinit_font,
+   xfonts_free_font,
    xfonts_render_msg,
    "XDK1 Xfonts",
 };

gfx/drivers_font/xdk360_fonts.cpp

@@ -244,7 +244,7 @@ error:
    return false;
 }
 
-static void xdk360_deinit_font(void *data)
+static void xdk360_free_font(void *data)
 {
    xdk360_video_font_t *font = &m_Font;
 
@@ -482,7 +482,7 @@ static void xdk360_render_msg(void *data, const char *str_msg,
 
 d3d_font_renderer_t d3d_xbox360_font = {
    xdk360_init_font,
-   xdk360_deinit_font,
+   xdk360_free_font,
    xdk360_render_msg,
    "Xbox 360 fonts",
 };

gfx/font_d3d_driver.h

@@ -28,9 +28,9 @@ extern "C" {
 typedef struct d3d_font_renderer
 {
    bool (*init)(void *data, const char *font_path, unsigned font_size);
-   void (*deinit)(void *data);
+   void (*free)(void *data);
    void (*render_msg)(void *data, const char *msg,
-         const struct font_params *params);
+         const void *params);
    const char *ident;
 } d3d_font_renderer_t;