mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change signature of d3d_font_init_first

Browse Source
This commit is contained in:
twinaphex 2015-03-29 23:51:06 +02:00
parent bfbcbb6ae8
commit 07d28f7b31
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/d3d/d3d.cpp
View File

@ -308,10 +308,10 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
strlcpy(settings->video.font_path, "game:\\media\\Arial_12.xpr", strlcpy(settings->video.font_path, "game:\\media\\Arial_12.xpr",
sizeof(settings->video.font_path)); sizeof(settings->video.font_path));
#endif #endif
d3d->font_ctx = d3d_font_init_first(d3d, settings->video.font_path, 0); if (!d3d_font_init_first(&d3d->font_ctx, NULL,
if (!d3d->font_ctx) d3d, settings->video.font_path, 0))
{ {
RARCH_ERR("Failed to initialize font.\n"); RARCH_ERR("[D3D]: Failed to initialize font renderer.\n");
return false; return false;
} }

15
gfx/font_d3d_driver.c
View File

@ -27,16 +27,21 @@ static const d3d_font_renderer_t *d3d_font_backends[] = {
#endif #endif
}; };
const d3d_font_renderer_t *d3d_font_init_first(void *data, bool d3d_font_init_first(
const char *font_path, unsigned font_size) const void **font_driver, void **font_handle,
void *video_data, const char *font_path, unsigned font_size)
{ {
unsigned i; unsigned i;
for (i = 0; i < ARRAY_SIZE(d3d_font_backends); i++) for (i = 0; i < ARRAY_SIZE(d3d_font_backends); i++)
{ {
if (d3d_font_backends[i]->init(data, font_path, font_size)) if (!d3d_font_backends[i]->init(video_data, font_path, font_size))
return d3d_font_backends[i]; return false;
*font_driver = d3d_font_backends[i];
return true;
} }
return NULL; return false;
} }

5
gfx/font_d3d_driver.h
View File

@ -42,8 +42,9 @@ extern d3d_font_renderer_t d3d_xbox360_font;
extern d3d_font_renderer_t d3d_xdk1_font; extern d3d_font_renderer_t d3d_xdk1_font;
extern d3d_font_renderer_t d3d_win32_font; extern d3d_font_renderer_t d3d_win32_font;
const d3d_font_renderer_t *d3d_font_init_first(void *data, bool d3d_font_init_first(
const char *font_path, unsigned font_size); const void **font_driver, void **font_handle,
void *video_data, const char *font_path, unsigned font_size);
#ifdef __cplusplus #ifdef __cplusplus
} }