From b09a7bae439f32225af30f7c8ec5dd88cbea3696 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Fri, 1 Nov 2013 17:36:31 +0100
Subject: [PATCH] (XDK) Move font context initing to xdk_d3d_init

---
 gfx/fonts/xdk1_xfonts.c    |  3 +--
 gfx/fonts/xdk360_fonts.cpp |  1 +
 xdk/xdk_d3d.cpp            | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gfx/fonts/xdk1_xfonts.c b/gfx/fonts/xdk1_xfonts.c
index 541e561fab..a585902e23 100644
--- a/gfx/fonts/xdk1_xfonts.c
+++ b/gfx/fonts/xdk1_xfonts.c
@@ -26,8 +26,7 @@ static bool xfonts_init_font(void *data, const char *font_path, unsigned font_si
 {
    (void)font_path;
    (void)font_size;
-
-   xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
+   (void)data;
 
    XFONT_OpenDefaultFont(&debug_font);
    debug_font->SetBkMode(XFONT_TRANSPARENT);
diff --git a/gfx/fonts/xdk360_fonts.cpp b/gfx/fonts/xdk360_fonts.cpp
index 8fbce79b7f..e8b208f752 100644
--- a/gfx/fonts/xdk360_fonts.cpp
+++ b/gfx/fonts/xdk360_fonts.cpp
@@ -180,6 +180,7 @@ static HRESULT xdk360_video_font_create_shaders (xdk360_video_font_t * font)
 static bool xdk_init_font(void *data, const char *font_path, unsigned font_size)
 {
    (void)font_size;
+   (void)data;
 
    // Create the font
    xdk360_video_font_t *font = &m_Font;
diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp
index 907af25883..104a627b8d 100644
--- a/xdk/xdk_d3d.cpp
+++ b/xdk/xdk_d3d.cpp
@@ -691,7 +691,14 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
 
    xdk_d3d_set_rotation(d3d, g_settings.video.rotation);
 
-   //really returns driver.video_data to driver.video_data - see comment above
+#if defined(_XBOX1)
+   font_x = 0;
+   font_y = 0;
+#elif defined(_XBOX360)
+   strlcpy(g_settings.video.font_path, "game:\\media\\Arial_12.xpr", sizeof(g_settings.video.font_path));
+#endif
+   d3d->font_ctx = d3d_font_init_first(d3d, g_settings.video.font_path, 0 /* font size - fixed/unused */);
+
    return d3d;
 }
 
@@ -1135,14 +1142,6 @@ static void xdk_d3d_start(void)
 
    xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
    d3d_get_poke_interface(d3d, &driver.video_poke);
-
-#if defined(_XBOX1)
-   font_x = 0;
-   font_y = 0;
-#elif defined(_XBOX360)
-   snprintf(g_settings.video.font_path, sizeof(g_settings.video.font_path), "game:\\media\\Arial_12.xpr");
-#endif
-   d3d->font_ctx = d3d_font_init_first(d3d, g_settings.video.font_path, 0 /* font size - fixed/unused */);
 }
 
 static void xdk_d3d_restart(void)