mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Font drivers) Simplifications

Browse Source
This commit is contained in:
twinaphex 2020-06-24 21:27:47 +02:00
parent 9cb4d924cb
commit 67898f5d12
9 changed files with 93 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gfx/drivers_font/ctr_font.c
View File

@ -334,25 +334,18 @@ static void ctr_font_render_message(
for (;;)
{
const char* delim = strchr(msg, '\n');
unsigned msg_len = delim ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
if (delim)
{
unsigned msg_len = delim - msg;
ctr_font_render_line(ctr, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
width, height, text_align);
msg += msg_len + 1;
lines++;
}
else
{
unsigned msg_len = strlen(msg);
ctr_font_render_line(ctr, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
width, height, text_align);
ctr_font_render_line(ctr, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
width, height, text_align);
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}

29
gfx/drivers_font/d3d10_font.c
View File

@ -259,27 +259,20 @@ static void d3d10_font_render_message(
for (;;)
{
const char* delim = strchr(msg, '\n');
unsigned msg_len = delim ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
if (delim)
{
unsigned msg_len = delim - msg;
d3d10_font_render_line(d3d10,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height,
width, height, text_align);
msg += msg_len + 1;
lines++;
}
else
{
unsigned msg_len = strlen(msg);
d3d10_font_render_line(d3d10,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height,
width, height, text_align);
d3d10_font_render_line(d3d10,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height,
width, height, text_align);
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}

29
gfx/drivers_font/d3d11_font.c
View File

@ -256,27 +256,20 @@ static void d3d11_font_render_message(
for (;;)
{
const char* delim = strchr(msg, '\n');
unsigned msg_len = delim ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
if (delim)
{
unsigned msg_len = delim - msg;
d3d11_font_render_line(d3d11,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height,
width, height, text_align);
msg += msg_len + 1;
lines++;
}
else
{
unsigned msg_len = strlen(msg);
d3d11_font_render_line(d3d11,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height,
width, height, text_align);
d3d11_font_render_line(d3d11,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height,
width, height, text_align);
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}

26
gfx/drivers_font/d3d12_font.c
View File

@ -270,25 +270,19 @@ static void d3d12_font_render_message(
for (;;)
{
const char* delim = strchr(msg, '\n');
unsigned msg_len = delim ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
if (delim)
{
unsigned msg_len = delim - msg;
d3d12_font_render_line(d3d12,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height, width, height, text_align);
msg += msg_len + 1;
lines++;
}
else
{
unsigned msg_len = strlen(msg);
d3d12_font_render_line(d3d12,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height, width, height, text_align);
d3d12_font_render_line(d3d12,
font, msg, msg_len, scale, color, pos_x,
pos_y - (float)lines * line_height, width, height, text_align);
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}

40
gfx/drivers_font/metal_raster_font.m
View File

@ -365,34 +365,24 @@ static INLINE void write_quad6(SpriteVertex *pv,
for (;;)
{
const char *delim = strchr(msg, '\n');
const char *delim = strchr(msg, '\n');
NSUInteger msg_len = delim ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
if (delim)
{
NSUInteger msg_len = delim - msg;
[self _renderLine:msg
length:msg_len
scale:scale
color:color
posX:posX
posY:posY - (float)lines * line_height
aligned:aligned];
msg += msg_len + 1;
lines++;
}
else
{
NSUInteger msg_len = strlen(msg);
[self _renderLine:msg
length:msg_len
scale:scale
color:color
posX:posX
posY:posY - (float)lines * line_height
aligned:aligned];
[self _renderLine:msg
length:msg_len
scale:scale
color:color
posX:posX
posY:posY - (float)lines * line_height
aligned:aligned];
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}

37
gfx/drivers_font/switch_font.c
View File

@ -197,7 +197,7 @@ static void switch_font_render_message(
int lines = 0;
float line_height;
if (!msg || !*msg)
if (!msg || !*msg || !sw)
return;
/* If font line metrics are not supported just draw as usual */
@ -218,33 +218,20 @@ static void switch_font_render_message(
for (;;)
{
const char *delim = strchr(msg, '\n');
unsigned msg_len = delim ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
if (delim)
{
unsigned msg_len = delim - msg;
if (msg_len <= AVG_GLPYH_LIMIT)
{
if (sw)
switch_font_render_line(sw, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
text_align);
}
msg += msg_len + 1;
lines++;
}
else
{
unsigned msg_len = strlen(msg);
if (msg_len <= AVG_GLPYH_LIMIT)
{
if (sw)
switch_font_render_line(sw, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
text_align);
}
if (msg_len <= AVG_GLPYH_LIMIT)
switch_font_render_line(sw, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
text_align);
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}

5
gfx/drivers_font/vita2d_font.c
View File

@ -246,13 +246,14 @@ static void vita2d_font_render_message(
for (;;)
{
const char *delim = strchr(msg, '\n');
unsigned msg_len = (delim) ? (delim - msg) : strlen(msg);
unsigned msg_len = (delim) ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
vita2d_font_render_line(font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
width, height, text_align);
/* Draw the line */
if (!delim)
break;

33
gfx/drivers_font/vulkan_raster_font.c
View File

@ -244,9 +244,8 @@ static void vulkan_raster_font_render_message(
if (!font->font_driver->get_line_metrics ||
!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
{
if (font->vk)
vulkan_raster_font_render_line(font, msg, strlen(msg),
scale, color, pos_x, pos_y, text_align);
vulkan_raster_font_render_line(font, msg, strlen(msg),
scale, color, pos_x, pos_y, text_align);
return;
}
@ -255,27 +254,19 @@ static void vulkan_raster_font_render_message(
for (;;)
{
const char *delim = strchr(msg, '\n');
unsigned msg_len = delim
? (unsigned)(delim - msg) : (unsigned)strlen(msg);
/* Draw the line */
if (delim)
{
unsigned msg_len = delim - msg;
if (font->vk)
vulkan_raster_font_render_line(font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
text_align);
msg += msg_len + 1;
lines++;
}
else
{
unsigned msg_len = strlen(msg);
if (font->vk)
vulkan_raster_font_render_line(font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
text_align);
vulkan_raster_font_render_line(font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
text_align);
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}

26
gfx/drivers_font/wiiu_font.c
View File

@ -263,25 +263,19 @@ static void wiiu_font_render_message(
for (;;)
{
const char* delim = strchr(msg, '\n');
unsigned msg_len = delim ?
(unsigned)(delim - msg) : strlen(msg);
/* Draw the line */
if (delim)
{
unsigned msg_len = delim - msg;
wiiu_font_render_line(wiiu, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
width, height, text_align);
msg += msg_len + 1;
lines++;
}
else
{
unsigned msg_len = strlen(msg);
wiiu_font_render_line(wiiu, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
width, height, text_align);
wiiu_font_render_line(wiiu, font, msg, msg_len,
scale, color, pos_x, pos_y - (float)lines * line_height,
width, height, text_align);
if (!delim)
break;
}
msg += msg_len + 1;
lines++;
}
}