mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take out d3d_common function call from d3d_w32_font.c

Browse Source
This commit is contained in:
twinaphex 2018-03-03 05:42:14 +01:00
parent 59dae251b0
commit 0566b056a5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/d3d8.c
View File

@ -1117,7 +1117,9 @@ static void d3d8_set_osd_msg(void *data,
{
d3d_video_t *d3d = (d3d_video_t*)data;
d3d_begin_scene(d3d->dev);
font_driver_render_msg(video_info, font, msg, params);
d3d_end_scene(d3d->dev);
}
static void d3d8_input_driver(
@ -1636,7 +1638,9 @@ static bool d3d8_frame(void *data, const void *frame,
if (!string_is_empty(msg))
{
d3d_set_viewports(d3d->dev, &screen_vp);
d3d_begin_scene(d3d->dev);
font_driver_render_msg(video_info, NULL, msg, NULL);
d3d_end_scene(d3d->dev);
}
d3d8_update_title(video_info);

4
gfx/drivers/d3d9.c
View File

@ -1070,7 +1070,9 @@ static void d3d9_set_osd_msg(void *data,
if (d3d->renderchain_driver->set_font_rect && params)
d3d->renderchain_driver->set_font_rect(d3d, params);
d3d_begin_scene(d3d->dev);
font_driver_render_msg(video_info, font, msg, params);
d3d_end_scene(d3d->dev);
}
static void d3d9_input_driver(
@ -1612,7 +1614,9 @@ static bool d3d9_frame(void *data, const void *frame,
if (msg && *msg)
{
d3d_set_viewports(d3d->dev, &screen_vp);
d3d_begin_scene(d3d->dev);
font_driver_render_msg(video_info, NULL, msg, NULL);
d3d_end_scene(d3d->dev);
}
d3d9_update_title(video_info);

6
gfx/drivers_font/d3d_w32_font.c
View File

@ -117,7 +117,7 @@ static int d3dfonts_w32_get_message_width(void* data, const char* msg,
RECT box = {0,0,0,0};
d3dfonts_t *d3dfonts = (d3dfonts_t*)data;
if (!d3dfonts || !d3dfonts->d3d | !msg)
if (!d3dfonts || !msg)
return 0;
d3dx_font_draw_text(d3dfonts->font, NULL, (void*)msg,
@ -146,8 +146,6 @@ static void d3dfonts_w32_render_msg(video_frame_info_t *video_info,
if (!d3dfonts || !d3dfonts->d3d || !msg)
return;
if (!d3d_begin_scene(d3dfonts->d3d->dev))
return;
format = DT_LEFT;
p_rect = &d3dfonts->d3d->font_rect;
@ -222,8 +220,6 @@ static void d3dfonts_w32_render_msg(video_frame_info_t *video_info,
d3dx_font_draw_text(d3dfonts->font, NULL, (void*)msg, -1,
p_rect, format, D3DCOLOR_ARGB(a, r, g, b));
d3d_end_scene(d3dfonts->d3d->dev);
}
font_renderer_t d3d_win32_font = {