Fixup Win32/Xbox font_params_t.

frontend/menu/disp/rmenu.c

@@ -72,7 +72,7 @@ static void rmenu_render_background(void)
 
 static void rmenu_render_messagebox(const char *message)
 {
-   font_params_t font_parms;
+   struct font_params font_parms;
 
    size_t i, j;
 
@@ -117,7 +117,7 @@ static void rmenu_render_messagebox(const char *message)
 static void rmenu_render(void)
 {
    size_t begin, end;
-   font_params_t font_parms;
+   struct font_params font_parms;
    rgui_handle_t *rgui = (rgui_handle_t*)driver.menu;
 
    if (!rgui)

frontend/menu/disp/rmenu_xui.cpp

@@ -245,7 +245,7 @@ static void rmenu_xui_free(void *data)
 
 static void xui_render_message(const char *msg)
 {
-	font_params_t font_parms;
+	struct font_params font_parms;
 	size_t i, j;
 
 	struct string_list *list = string_split(msg, "\n");

gfx/d3d9/d3d.cpp

@@ -280,7 +280,7 @@ bool d3d_init_multipass(void *data)
 }
 #endif
 
-void d3d_set_font_rect(void *data, font_params_t *params)
+void d3d_set_font_rect(void *data, const struct font_params *params)
 {
 #ifndef _XBOX
    d3d_video_t *d3d = (d3d_video_t*)data;
@@ -742,7 +742,7 @@ static bool d3d_frame(void *data, const void *frame,
 
    if (d3d->font_ctx && d3d->font_ctx->render_msg && msg)
    {
-      font_params_t font_parms = {0};
+      struct font_params font_parms = {0};
 #ifdef _XBOX
 #if defined(_XBOX1)
       float msg_width  = 60;
@@ -1130,9 +1130,8 @@ static void d3d_apply_state_changes(void *data)
    d3d->should_resize = true;
 }
 
-static void d3d_set_osd_msg(void *data, const char *msg, void *userdata)
+static void d3d_set_osd_msg(void *data, const char *msg, const struct font_params *params)
 {
-   font_params_t *params = (font_params_t*)userdata;
    d3d_video_t *d3d = (d3d_video_t*)data;
 
    if (params)

gfx/d3d9/d3d9.hpp

@@ -98,7 +98,7 @@ typedef struct
    LPDIRECT3DVERTEXBUFFER vert_buf;
 } overlay_t;
 
-void d3d_set_font_rect(void *data, font_params_t *params);
+void d3d_set_font_rect(void *data, const struct font_params *params);
 bool d3d_process_shader(void *data);
 void d3d_update_title(void *data);
 void d3d_recompute_pass_sizes(void *data);

gfx/fonts/d3d_font.h

@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include "../../boolean.h"
+#include "../../driver.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,7 +28,7 @@ typedef struct d3d_font_renderer
 {
    bool (*init)(void *data, const char *font_path, unsigned font_size);
    void (*deinit)(void *data);
-   void (*render_msg)(void *data, const char *msg, void *parms);
+   void (*render_msg)(void *data, const char *msg, const struct font_params *params);
    const char *ident;
 } d3d_font_renderer_t;
 

gfx/fonts/d3d_w32_font.cpp

@@ -49,10 +49,9 @@ static void d3dfonts_w32_deinit_font(void *data)
    d3d->font = NULL;
 }
 
-static void d3dfonts_w32_render_msg(void *data, const char *msg, void *userdata)
+static void d3dfonts_w32_render_msg(void *data, const char *msg, const struct font_params *params)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
-   font_params_t *params = (font_params_t*)userdata;
 
    if (msg && SUCCEEDED(d3d->dev->BeginScene()))
    {

gfx/fonts/xdk1_xfonts.c

@@ -42,10 +42,9 @@ static void xfonts_deinit_font(void *data)
    (void)data;
 }
 
-static void xfonts_render_msg(void *data, const char *msg, void *parms)
+static void xfonts_render_msg(void *data, const char *msg, const struct font_params *params)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
-   font_params_t *params = (font_params_t*)parms;
    wchar_t str[PATH_MAX];
    float x, y;
 

gfx/fonts/xdk360_fonts.cpp

@@ -435,11 +435,10 @@ static void xdk_video_font_draw_text(xdk360_video_font_t *font, void *video_data
    d3dr->EndVertices();
 }
 
-static void xdk_render_msg(void *data, const char *str_msg, void *parms)
+static void xdk_render_msg(void *data, const char *str_msg, const struct font_params *params)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
    xdk360_video_font_t *font = &m_Font;
-   font_params_t *params = (font_params_t*)parms;
    wchar_t msg[PATH_MAX];
    float x, y;
 

xdk/xdk_d3d.cpp

@@ -904,7 +904,7 @@ static bool d3d_frame(void *data, const void *frame,
       float msg_width  = (g_extern.lifecycle_state & (1ULL << MODE_MENU_HD)) ? 160 : 100;
       float msg_height = 90;
 #endif
-      font_params_t font_parms = {0};
+      struct font_params font_parms = {0};
       font_parms.x = msg_width;
       font_parms.y = msg_height;
       font_parms.scale = 21;
@@ -1020,10 +1020,9 @@ static void d3d_set_texture_enable(void *data, bool state, bool full_screen)
 }
 #endif
 
-static void d3d_set_osd_msg(void *data, const char *msg, void *userdata)
+static void d3d_set_osd_msg(void *data, const char *msg, const struct font_params *params)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
-   font_params_t *params = (font_params_t*)userdata;
 
    if (d3d->font_ctx && d3d->font_ctx->render_msg)
       d3d->font_ctx->render_msg(d3d, msg, params);