libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-08 15:13:24 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(XDK) Move font context initing to xdk_d3d_init

Browse Source
This commit is contained in:
twinaphex 2013-11-01 17:36:31 +01:00
parent ed1b012250
commit b09a7bae43
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/fonts/xdk1_xfonts.c
View File

@ -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);

1
gfx/fonts/xdk360_fonts.cpp
View File

@ -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;

17
xdk/xdk_d3d.cpp
View File

@ -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)