libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-19 09:02:26 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Get rid of video_frame_info dep for fonts

Browse Source
This commit is contained in:
twinaphex 2020-03-10 03:24:59 +01:00
parent 35a528a3e0
commit f4c5036c3c
48 changed files with 98 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/common/metal_common.m
View File

@ -332,7 +332,7 @@
if (osd_params)
{
[rce pushDebugGroup:@"video stats"];
font_driver_render_msg(data, video_info, video_info->stat_text, osd_params, NULL);
font_driver_render_msg(data, video_info->stat_text, osd_params, NULL);
[rce popDebugGroup];
}
}
@ -349,7 +349,7 @@
if (msg && *msg)
{
[rce pushDebugGroup:@"message"];
[self _renderMessage:msg info:video_info];
[self _renderMessage:msg data:data];
[rce popDebugGroup];
}
@ -360,7 +360,7 @@
}
- (void)_renderMessage:(const char *)msg
info:(video_frame_info_t *)video_info
data:(void*)data
{
settings_t *settings = config_get_ptr();
bool msg_bgcolor_enable = settings->bools.video_msg_bgcolor_enable;
@ -402,7 +402,7 @@
[_context drawQuadX:x y:y w:width h:height r:r g:g b:b a:a];
}
font_driver_render_msg(NULL, video_info, msg, NULL, NULL);
font_driver_render_msg(data, msg, NULL, NULL);
}
- (void)_beginFrame

2
gfx/drivers/caca_gfx.c
View File

@ -145,7 +145,7 @@ static bool caca_gfx_frame(void *data, const void *frame,
#endif
if (msg)
font_driver_render_msg(data, video_info, msg, NULL, NULL);
font_driver_render_msg(data, msg, NULL, NULL);
if (draw)
{

7
gfx/drivers/ctr_gfx.c
View File

@ -868,14 +868,14 @@ static bool ctr_frame(void* data, const void* frame,
{
if (osd_params)
{
font_driver_render_msg(ctr, video_info, stat_text,
font_driver_render_msg(ctr, stat_text,
(const struct font_params*)osd_params, NULL);
}
}
#endif
if (msg)
font_driver_render_msg(ctr, video_info, msg, NULL, NULL);
font_driver_render_msg(ctr, msg, NULL, NULL);
GPU_FinishDrawing();
GPU_Finalize();
@ -1189,14 +1189,13 @@ static void ctr_unload_texture(void *data, uintptr_t handle)
}
static void ctr_set_osd_msg(void *data,
video_frame_info_t *video_info,
const char *msg,
const void *params, void *font)
{
ctr_video_t* ctr = (ctr_video_t*)data;
if (ctr && ctr->msg_rendering_enabled)
font_driver_render_msg(data, video_info, msg, params, font);
font_driver_render_msg(data, msg, params, font);
}
static uint32_t ctr_get_flags(void *data)

12
gfx/drivers/d3d10.c
View File

@ -1483,7 +1483,7 @@ static bool d3d10_gfx_frame(
D3D10SetBlendState(d3d10->device, d3d10->blend_enable, NULL, D3D10_DEFAULT_SAMPLE_MASK);
D3D10SetVertexBuffer(context, 0, d3d10->sprites.vbo, sizeof(d3d10_sprite_t), 0);
font_driver_render_msg(d3d10,
video_info, stat_text,
stat_text,
(const struct font_params*)osd_params, NULL);
}
}
@ -1519,7 +1519,7 @@ static bool d3d10_gfx_frame(
D3D10SetViewports(d3d10->device, 1, &d3d10->viewport);
D3D10SetBlendState(d3d10->device, d3d10->blend_enable, NULL, D3D10_DEFAULT_SAMPLE_MASK);
D3D10SetVertexBuffer(d3d10->device, 0, d3d10->sprites.vbo, sizeof(d3d10_sprite_t), 0);
font_driver_render_msg(d3d10, video_info, msg, NULL, NULL);
font_driver_render_msg(d3d10, msg, NULL, NULL);
dxgi_update_title();
}
d3d10->sprites.enabled = false;
@ -1642,16 +1642,16 @@ static void d3d10_gfx_apply_state_changes(void* data)
}
static void d3d10_gfx_set_osd_msg(
void* data, video_frame_info_t* video_info, const char* msg, const void* params, void* font)
void* data,
const char* msg, const void* params, void* font)
{
d3d10_video_t* d3d10 = (d3d10_video_t*)data;
if (d3d10)
{
if (d3d10->sprites.enabled)
font_driver_render_msg(d3d10, video_info, msg, (const struct font_params*)params, font);
else
printf("OSD msg: %s\n", msg);
font_driver_render_msg(d3d10, msg,
(const struct font_params*)params, font);
}
}

13
gfx/drivers/d3d11.c
View File

@ -1556,7 +1556,7 @@ static bool d3d11_gfx_frame(
D3D11SetBlendState(d3d11->context, d3d11->blend_enable, NULL, D3D11_DEFAULT_SAMPLE_MASK);
D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0);
font_driver_render_msg(d3d11,
video_info, stat_text,
stat_text,
(const struct font_params*)osd_params, NULL);
}
}
@ -1592,7 +1592,7 @@ static bool d3d11_gfx_frame(
D3D11SetViewports(context, 1, &d3d11->viewport);
D3D11SetBlendState(d3d11->context, d3d11->blend_enable, NULL, D3D11_DEFAULT_SAMPLE_MASK);
D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0);
font_driver_render_msg(d3d11, video_info, msg, NULL, NULL);
font_driver_render_msg(d3d11, msg, NULL, NULL);
dxgi_update_title();
}
d3d11->sprites.enabled = false;
@ -1716,14 +1716,19 @@ static void d3d11_gfx_apply_state_changes(void* data)
}
static void d3d11_gfx_set_osd_msg(
void* data, video_frame_info_t* video_info, const char* msg, const void* params, void* font)
void* data,
const char* msg,
const void* params,
void* font)
{
d3d11_video_t* d3d11 = (d3d11_video_t*)data;
if (d3d11)
{
if (d3d11->sprites.enabled)
font_driver_render_msg(d3d11, video_info, msg, (const struct font_params*)params, font);
font_driver_render_msg(d3d11,
msg,
(const struct font_params*)params, font);
else
printf("OSD msg: %s\n", msg);
}

12
gfx/drivers/d3d12.c
View File

@ -1525,7 +1525,7 @@ static bool d3d12_gfx_frame(
D3D12RSSetViewports(d3d12->queue.cmd, 1, &d3d12->chain.viewport);
D3D12RSSetScissorRects(d3d12->queue.cmd, 1, &d3d12->chain.scissorRect);
D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view);
font_driver_render_msg(d3d12, video_info, stat_text,
font_driver_render_msg(d3d12, stat_text,
(const struct font_params*)osd_params, NULL);
}
}
@ -1577,7 +1577,7 @@ static bool d3d12_gfx_frame(
D3D12RSSetScissorRects(d3d12->queue.cmd, 1, &d3d12->chain.scissorRect);
D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view);
font_driver_render_msg(d3d12, video_info, msg, NULL, NULL);
font_driver_render_msg(d3d12, msg, NULL, NULL);
dxgi_update_title();
}
d3d12->sprites.enabled = false;
@ -1729,15 +1729,17 @@ static void d3d12_gfx_apply_state_changes(void* data)
}
static void d3d12_gfx_set_osd_msg(
void* data, video_frame_info_t* video_info,
const char* msg, const void* params, void* font)
void* data,
const char* msg,
const void* params,
void* font)
{
d3d12_video_t* d3d12 = (d3d12_video_t*)data;
if (!d3d12 || !d3d12->sprites.enabled)
return;
font_driver_render_msg(d3d12, video_info, msg,
font_driver_render_msg(d3d12, msg,
(const struct font_params*)params, font);
}

7
gfx/drivers/d3d8.c
View File

@ -1096,14 +1096,13 @@ static void d3d8_apply_state_changes(void *data)
}
static void d3d8_set_osd_msg(void *data,
video_frame_info_t *video_info,
const char *msg,
const void *params, void *font)
{
d3d8_video_t *d3d = (d3d8_video_t*)data;
d3d8_begin_scene(d3d->dev);
font_driver_render_msg(d3d, video_info, msg, params, font);
font_driver_render_msg(d3d, msg, params, font);
d3d8_end_scene(d3d->dev);
}
@ -1562,7 +1561,7 @@ static bool d3d8_frame(void *data, const void *frame,
else if (statistics_show)
{
if (osd_params)
font_driver_render_msg(d3d, video_info, stat_text,
font_driver_render_msg(d3d, stat_text,
(const struct font_params*)osd_params, NULL);
}
#endif
@ -1580,7 +1579,7 @@ static bool d3d8_frame(void *data, const void *frame,
{
d3d8_set_viewports(d3d->dev, &screen_vp);
d3d8_begin_scene(d3d->dev);
font_driver_render_msg(d3d, video_info, msg, NULL, NULL);
font_driver_render_msg(d3d, msg, NULL, NULL);
d3d8_end_scene(d3d->dev);
}

7
gfx/drivers/d3d9.c
View File

@ -1106,7 +1106,6 @@ static void d3d9_apply_state_changes(void *data)
}
static void d3d9_set_osd_msg(void *data,
video_frame_info_t *video_info,
const char *msg,
const void *params, void *font)
{
@ -1117,7 +1116,7 @@ static void d3d9_set_osd_msg(void *data,
d3d9_set_font_rect(d3d, d3d_font_params);
d3d9_begin_scene(dev);
font_driver_render_msg(d3d, video_info,
font_driver_render_msg(d3d,
msg, d3d_font_params, font);
d3d9_end_scene(dev);
}
@ -1612,7 +1611,7 @@ static bool d3d9_frame(void *data, const void *frame,
{
d3d9_set_viewports(d3d->dev, &screen_vp);
d3d9_begin_scene(d3d->dev);
font_driver_render_msg(d3d, video_info, stat_text,
font_driver_render_msg(d3d, stat_text,
(const struct font_params*)osd_params, NULL);
d3d9_end_scene(d3d->dev);
}
@ -1637,7 +1636,7 @@ static bool d3d9_frame(void *data, const void *frame,
{
d3d9_set_viewports(d3d->dev, &screen_vp);
d3d9_begin_scene(d3d->dev);
font_driver_render_msg(d3d, video_info, msg, NULL, NULL);
font_driver_render_msg(d3d, msg, NULL, NULL);
d3d9_end_scene(d3d->dev);
}

2
gfx/drivers/exynos_gfx.c
View File

@ -1329,7 +1329,7 @@ static bool exynos_gfx_frame(void *data, const void *frame, unsigned width,
(struct font_params*)&video_info->osd_stat_params : NULL;
if (osd_params)
font_driver_render_msg(vid, video_info, video_info->stat_text,
font_driver_render_msg(vid, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
}

2
gfx/drivers/gdi_gfx.c
View File

@ -345,7 +345,7 @@ static bool gdi_gfx_frame(void *data, const void *frame,
free(info);
if (msg)
font_driver_render_msg(gdi, video_info, msg, NULL, NULL);
font_driver_render_msg(gdi, msg, NULL, NULL);
InvalidateRect(hwnd, NULL, false);

4
gfx/drivers/gl.c
View File

@ -3042,7 +3042,7 @@ static bool gl2_frame(void *data, const void *frame,
else if (statistics_show)
{
if (osd_params)
font_driver_render_msg(gl, video_info, stat_text,
font_driver_render_msg(gl, stat_text,
(const struct font_params*)osd_params, NULL);
}
#endif
@ -3061,7 +3061,7 @@ static bool gl2_frame(void *data, const void *frame,
{
if (msg_bgcolor_enable)
gl2_render_osd_background(gl, msg);
font_driver_render_msg(gl, video_info, msg, NULL, NULL);
font_driver_render_msg(gl, msg, NULL, NULL);
}
if (video_info->cb_update_window_title)

6
gfx/drivers/gl1.c
View File

@ -845,12 +845,12 @@ static bool gl1_gfx_frame(void *data, const void *frame,
if (osd_params)
{
font_driver_render_msg(gl1, video_info, video_info->stat_text,
font_driver_render_msg(gl1, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
#if 0
osd_params->y = 0.350f;
osd_params->scale = 0.75f;
font_driver_render_msg(gl1, video_info, video_info->chat_text,
font_driver_render_msg(gl1, video_info->chat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
#endif
}
@ -868,7 +868,7 @@ static bool gl1_gfx_frame(void *data, const void *frame,
#endif
if (msg)
font_driver_render_msg(gl1, video_info, msg, NULL, NULL);
font_driver_render_msg(gl1, msg, NULL, NULL);
video_info->cb_update_window_title(
video_info->context_data);

4
gfx/drivers/gl_core.c
View File

@ -1916,7 +1916,7 @@ static bool gl_core_frame(void *data, const void *frame,
&video_info->osd_stat_params;
if (osd_params)
font_driver_render_msg(gl, video_info, video_info->stat_text,
font_driver_render_msg(gl, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
}
#endif
@ -1937,7 +1937,7 @@ static bool gl_core_frame(void *data, const void *frame,
if (video_info->msg_bgcolor_enable)
gl_core_render_osd_background(gl, video_info, msg);
#endif
font_driver_render_msg(gl, video_info, msg, NULL, NULL);
font_driver_render_msg(gl, msg, NULL, NULL);
}
video_info->cb_update_window_title(

14
gfx/drivers/gx2_gfx.c
View File

@ -1343,7 +1343,7 @@ static bool wiiu_gfx_frame(void *data, const void *frame,
&video_info->osd_stat_params;
if (osd_params)
font_driver_render_msg(wiiu, video_info, video_info->stat_text,
font_driver_render_msg(wiiu, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
}
@ -1353,7 +1353,7 @@ static bool wiiu_gfx_frame(void *data, const void *frame,
#endif
if (msg)
font_driver_render_msg(wiiu, video_info, msg, NULL, NULL);
font_driver_render_msg(wiiu, msg, NULL, NULL);
wiiu->render_msg_enabled = false;
@ -1676,20 +1676,16 @@ static void wiiu_gfx_set_texture_enable(void *data, bool state, bool full_screen
}
static void wiiu_gfx_set_osd_msg(void *data,
video_frame_info_t *video_info,
const char *msg,
const void *params, void *font)
const char *msg,
const void *params, void *font)
{
wiiu_video_t *wiiu = (wiiu_video_t *)data;
if (wiiu)
{
if (wiiu->render_msg_enabled)
font_driver_render_msg(wiiu, video_info, msg, params, font);
else
printf("OSD msg: %s\n", msg);
font_driver_render_msg(wiiu, msg, params, font);
}
}
static uint32_t wiiu_gfx_get_flags(void *data)

2
gfx/drivers/network_gfx.c
View File

@ -323,7 +323,7 @@ static bool network_gfx_frame(void *data, const void *frame,
}
if (msg)
font_driver_render_msg(network, video_info, msg, NULL, NULL);
font_driver_render_msg(network, msg, NULL, NULL);
return true;
}

4
gfx/drivers/ps2_gfx.c
View File

@ -351,12 +351,12 @@ static bool ps2_gfx_frame(void *data, const void *frame,
&video_info->osd_stat_params;
if (osd_params)
font_driver_render_msg(ps2, video_info, video_info->stat_text,
font_driver_render_msg(ps2, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
}
if(!string_is_empty(msg))
font_driver_render_msg(ps2, video_info, msg, NULL, NULL);
font_driver_render_msg(ps2, msg, NULL, NULL);
refreshScreen(ps2);

2
gfx/drivers/sdl2_gfx.c
View File

@ -681,13 +681,11 @@ static void sdl2_poke_texture_enable(void *data,
}
static void sdl2_poke_set_osd_msg(void *data,
video_frame_info_t *video_info,
const char *msg,
const void *params, void *font)
{
sdl2_video_t *vid = (sdl2_video_t*)data;
sdl2_render_msg(vid, msg);
RARCH_LOG("[SDL2]: OSD MSG: %s\n", msg);
}
static void sdl2_show_mouse(void *data, bool state)

1
gfx/drivers/sdl_dingux_gfx.c
View File

@ -166,7 +166,6 @@ static bool sdl_dingux_gfx_frame(void *data, const void *frame, unsigned width,
unsigned height, uint64_t frame_count,
unsigned pitch, const char *msg, video_frame_info_t *video_info)
{
// printf("sdl_gfx_frame width %d height %d pitch %d frame_count %lu\n", width, height, pitch, frame_count);
sdl_dingux_video_t* vid = (sdl_dingux_video_t*)data;
if (unlikely(!frame))

2
gfx/drivers/sixel_gfx.c
View File

@ -425,7 +425,7 @@ static bool sixel_gfx_frame(void *data, const void *frame,
}
if (msg)
font_driver_render_msg(sixel, video_info, msg, NULL, NULL);
font_driver_render_msg(sixel, msg, NULL, NULL);
return true;
}

2
gfx/drivers/switch_gfx.c
View File

@ -228,7 +228,7 @@ static bool switch_frame(void *data, const void *frame,
&video_info->osd_stat_params;
if (osd_params)
font_driver_render_msg(sw, video_info, video_info->stat_text,
font_driver_render_msg(sw, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
}
#endif

4
gfx/drivers/switch_nx_gfx.c
View File

@ -463,12 +463,12 @@ static bool switch_frame(void *data, const void *frame,
struct font_params *osd_params = (struct font_params *)&video_info->osd_stat_params;
if (osd_params)
font_driver_render_msg(sw, video_info, video_info->stat_text,
font_driver_render_msg(sw, video_info->stat_text,
(const struct font_params *)&video_info->osd_stat_params, NULL);
}
if (msg)
font_driver_render_msg(sw, video_info, msg, NULL, NULL);
font_driver_render_msg(sw, msg, NULL, NULL);
framebufferEnd(&sw->fb);

2
gfx/drivers/vga_gfx.c
View File

@ -227,7 +227,7 @@ static bool vga_gfx_frame(void *data, const void *frame,
}
if (msg)
font_driver_render_msg(data, video_info, msg, NULL, NULL);
font_driver_render_msg(data, msg, NULL, NULL);
video_info->cb_update_window_title(
video_info->context_data);

4
gfx/drivers/vita2d_gfx.c
View File

@ -258,7 +258,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
&video_info->osd_stat_params;
if (osd_params)
font_driver_render_msg(vita, video_info, video_info->stat_text,
font_driver_render_msg(vita, video_info->stat_text,
(const struct font_params*)&video_info->osd_stat_params, NULL);
}
@ -272,7 +272,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
#endif
if(!string_is_empty(msg))
font_driver_render_msg(vita, video_info, msg, NULL, NULL);
font_driver_render_msg(vita, msg, NULL, NULL);
vita2d_end_drawing();
vita2d_swap_buffers();

4
gfx/drivers/vulkan.c
View File

@ -1973,7 +1973,7 @@ static bool vulkan_frame(void *data, const void *frame,
else if (statistics_show)
{
if (osd_params)
font_driver_render_msg(vk, video_info,
font_driver_render_msg(vk,
stat_text,
&osd_params, NULL);
}
@ -1985,7 +1985,7 @@ static bool vulkan_frame(void *data, const void *frame,
#endif
if (!string_is_empty(msg))
font_driver_render_msg(vk, video_info, msg, NULL, NULL);
font_driver_render_msg(vk, msg, NULL, NULL);
#ifdef HAVE_GFX_WIDGETS
if (widgets_inited)

1
gfx/drivers_font/caca_font.c
View File

@ -78,7 +78,6 @@ static const struct font_glyph *caca_font_get_glyph(
static void caca_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
const struct font_params *params)
{

1
gfx/drivers_font/ctr_font.c
View File

@ -356,7 +356,6 @@ static void ctr_font_render_message(
static void ctr_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void* data, const char* msg,
const struct font_params *params)
{

5
gfx/drivers_font/d3d10_font.c
View File

@ -284,8 +284,9 @@ static void d3d10_font_render_message(
static void d3d10_font_render_msg(
void *userdata,
video_frame_info_t* video_info, void* data,
const char* msg, const struct font_params *params)
void* data,
const char* msg,
const struct font_params *params)
{
float x, y, scale, drop_mod, drop_alpha;
int drop_x, drop_y;

5
gfx/drivers_font/d3d11_font.c
View File

@ -280,8 +280,9 @@ static void d3d11_font_render_message(
static void d3d11_font_render_msg(
void *userdata,
video_frame_info_t* video_info, void* data,
const char* msg, const struct font_params *params)
void* data,
const char* msg,
const struct font_params *params)
{
float x, y, scale, drop_mod, drop_alpha;
int drop_x, drop_y;

5
gfx/drivers_font/d3d12_font.c
View File

@ -293,8 +293,9 @@ static void d3d12_font_render_message(
static void d3d12_font_render_msg(
void *userdata,
video_frame_info_t* video_info, void* data,
const char* msg, const struct font_params *params)
void* data,
const char* msg,
const struct font_params *params)
{
float x, y, scale, drop_mod, drop_alpha;
int drop_x, drop_y;

1
gfx/drivers_font/d3d_w32_font.c
View File

@ -127,7 +127,6 @@ static int d3dfonts_w32_get_message_width(void* data, const char* msg,
static void d3dfonts_w32_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
const struct font_params *params)
{

4
gfx/drivers_font/gdi_font.c
View File

@ -85,8 +85,8 @@ static const struct font_glyph *gdi_font_get_glyph(
static void gdi_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
float x, y, scale, drop_mod, drop_alpha;

4
gfx/drivers_font/gl1_raster_font.c
View File

@ -431,8 +431,8 @@ static void gl1_raster_font_setup_viewport(unsigned width, unsigned height,
static void gl1_raster_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
GLfloat color[4];

4
gfx/drivers_font/gl_core_raster_font.c
View File

@ -340,8 +340,8 @@ static void gl_core_raster_font_setup_viewport(unsigned width, unsigned height,
static void gl_core_raster_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
GLfloat color[4];

4
gfx/drivers_font/gl_raster_font.c
View File

@ -414,8 +414,8 @@ static void gl_raster_font_setup_viewport(unsigned width, unsigned height,
static void gl_raster_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
GLfloat color[4];

1
gfx/drivers_font/metal_raster_font.m
View File

@ -519,7 +519,6 @@ static int metal_get_message_width(void *data, const char *msg,
static void metal_raster_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
const struct font_params *params)
{

4
gfx/drivers_font/ps2_font.c
View File

@ -132,8 +132,8 @@ static void ps2_font_free_font(void *data, bool is_threaded)
static void ps2_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
ps2_font_info_t *ps2 = (ps2_font_info_t *)data;

4
gfx/drivers_font/sixel_font.c
View File

@ -77,8 +77,8 @@ static const struct font_glyph *sixel_font_get_glyph(
static void sixel_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *_params)
{
float x, y, scale;

4
gfx/drivers_font/switch_font.c
View File

@ -248,8 +248,8 @@ static void switch_font_render_message(
static void switch_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
float x, y, scale;

3
gfx/drivers_font/vga_font.c
View File

@ -78,7 +78,6 @@ static const struct font_glyph *vga_font_get_glyph(
static void vga_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
const struct font_params *params)
{
@ -130,6 +129,8 @@ static void vga_render_msg(
default:
break;
}
/* TODO/FIXME - implement */
}
font_renderer_t vga_font = {

4
gfx/drivers_font/vita2d_font.c
View File

@ -262,8 +262,8 @@ static void vita2d_font_render_message(
static void vita2d_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
float x, y, scale, drop_mod, drop_alpha;

4
gfx/drivers_font/vulkan_raster_font.c
View File

@ -336,8 +336,8 @@ static void vulkan_raster_font_flush(vulkan_raster_t *font)
static void vulkan_raster_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
float color[4], color_dark[4];

4
gfx/drivers_font/wiiu_font.c
View File

@ -285,8 +285,8 @@ static void wiiu_font_render_message(
static void wiiu_font_render_msg(
void *userdata,
video_frame_info_t *video_info,
void* data, const char* msg,
void* data,
const char* msg,
const struct font_params *params)
{
float x, y, scale, drop_mod, drop_alpha;

4
gfx/drivers_font/xdk1_xfonts.c
View File

@ -75,8 +75,8 @@ static void xfonts_free_font(void *data, bool is_threaded)
static void xfonts_render_msg(
void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
void *data,
const char *msg,
const struct font_params *params)
{
float x, y;

2
gfx/font_driver.c
View File

@ -1031,7 +1031,6 @@ end:
void font_driver_render_msg(
void *data,
video_frame_info_t *video_info,
const char *msg,
const void *_params,
void *font_data)
@ -1049,7 +1048,6 @@ void font_driver_render_msg(
#endif
font->renderer->render_msg(data,
video_info,
font->renderer_data, new_msg, params);
#ifdef HAVE_LANGEXTRA
free(new_msg);

2
gfx/font_driver.h
View File

@ -87,7 +87,6 @@ typedef struct font_renderer
float font_size, bool is_threaded);
void (*free)(void *data, bool is_threaded);
void (*render_msg)(void *userdata,
video_frame_info_t *video_info,
void *data, const char *msg,
const struct font_params *params);
const char *ident;
@ -132,7 +131,6 @@ int font_renderer_create_default(
const char *font_path, unsigned font_size);
void font_driver_render_msg(void *data,
video_frame_info_t *video_info,
const char *msg, const void *params, void *font_data);
void font_driver_bind_block(void *font_data, void *block);

3
gfx/video_thread_wrapper.c
View File

@ -1163,7 +1163,6 @@ static void thread_set_texture_enable(void *data, bool state, bool full_screen)
}
static void thread_set_osd_msg(void *data,
video_frame_info_t *video_info,
const char *msg,
const void *params, void *font)
{
@ -1175,7 +1174,7 @@ static void thread_set_osd_msg(void *data,
/* TODO : find a way to determine if the calling
* thread is the driver thread or not. */
if (thr->poke && thr->poke->set_osd_msg)
thr->poke->set_osd_msg(thr->driver_data, video_info, msg, params, font);
thr->poke->set_osd_msg(thr->driver_data, msg, params, font);
}
static uintptr_t thread_load_texture(void *video_data, void *data,

4
retroarch.c
View File

@ -22708,10 +22708,8 @@ bool video_driver_get_video_output_size(unsigned *width, unsigned *height)
void video_driver_set_osd_msg(const char *msg, const void *data, void *font)
{
video_frame_info_t video_info;
video_driver_build_info(&video_info);
if (video_driver_poke && video_driver_poke->set_osd_msg)
video_driver_poke->set_osd_msg(video_driver_data, &video_info, msg, data, font);
video_driver_poke->set_osd_msg(video_driver_data, msg, data, font);
}
void video_driver_set_texture_enable(bool enable, bool fullscreen)

2
retroarch.h
View File

@ -1402,7 +1402,7 @@ typedef struct video_poke_interface
unsigned width, unsigned height, float alpha);
/* Enable or disable rendering. */
void (*set_texture_enable)(void *data, bool enable, bool full_screen);
void (*set_osd_msg)(void *data, video_frame_info_t *video_info,
void (*set_osd_msg)(void *data,
const char *msg,
const void *params, void *font);