ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(vulkan_raster_font.c) Cleanups

This commit is contained in:
twinaphex 2017-04-24 17:39:23 +02:00
parent 765e636214
commit ee484b693c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/drivers_font/vulkan_raster_font.c
View File

@ -106,10 +106,9 @@ static int vulkan_get_message_width(void *data, const char *msg,
font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]); font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]);
if (!glyph) /* Do something smarter here ... */ if (!glyph) /* Do something smarter here ... */
glyph = font->font_driver->get_glyph(font->font_data, '?'); glyph = font->font_driver->get_glyph(font->font_data, '?');
if (!glyph)
continue;
delta_x += glyph->advance_x; if (glyph)
delta_x += glyph->advance_x;
} }
return delta_x * scale; return delta_x * scale;
@ -124,15 +123,15 @@ static void vulkan_raster_font_render_line(
float inv_tex_size_x, inv_tex_size_y, inv_win_width, inv_win_height; float inv_tex_size_x, inv_tex_size_y, inv_win_width, inv_win_height;
unsigned i; unsigned i;
struct vk_color vk_color; struct vk_color vk_color;
vk_t *vk = font ? font->vk : NULL; vk_t *vk = font ? font->vk : NULL;
if (!vk) if (!vk)
return; return;
x = roundf(pos_x * vk->vp.width); x = roundf(pos_x * vk->vp.width);
y = roundf((1.0f - pos_y) * vk->vp.height); y = roundf((1.0f - pos_y) * vk->vp.height);
delta_x = 0; delta_x = 0;
delta_y = 0; delta_y = 0;
vk_color.r = color[0]; vk_color.r = color[0];
vk_color.g = color[1]; vk_color.g = color[1];
@ -182,10 +181,11 @@ static void vulkan_raster_font_render_line(
width * inv_tex_size_x, width * inv_tex_size_x,
height * inv_tex_size_y, height * inv_tex_size_y,
&vk_color); &vk_color);
font->vertices += 6; font->vertices += 6;
delta_x += glyph->advance_x; delta_x += glyph->advance_x;
delta_y += glyph->advance_y; delta_y += glyph->advance_y;
} }
} }