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

(zr_common.c) Cleanups

This commit is contained in:
twinaphex 2016-03-22 01:20:41 +01:00
parent ddb912b373
commit b00878a595
1 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
menu/drivers/zr_common.c
View File

@ -131,81 +131,82 @@ struct zr_user_font zr_common_font(
{ {
int glyph_count; int glyph_count;
int img_width, img_height; int img_width, img_height;
void *img, *tmp;
size_t ttf_size;
size_t tmp_size, img_size;
struct texture_image ti;
struct zr_recti custom;
struct zr_font_config config;
struct zr_font_glyph *glyphes; struct zr_font_glyph *glyphes;
struct zr_baked_font baked_font; struct zr_baked_font baked_font;
struct zr_user_font user_font; struct zr_user_font user_font;
struct zr_recti custom; void *img_rgba = NULL;
char *ttf_blob = NULL;
const char *custom_data = "....";
memset(&baked_font, 0, sizeof(baked_font)); memset(&baked_font, 0, sizeof(baked_font));
memset(&user_font, 0, sizeof(user_font)); memset(&user_font, 0, sizeof(user_font));
memset(&custom, 0, sizeof(custom)); memset(&custom, 0, sizeof(custom));
{ /* bake and upload font texture */
struct texture_image ti; ttf_blob = zr_common_file_load(path, &ttf_size);
/* bake and upload font texture */ /* setup font configuration */
struct zr_font_config config; memset(&config, 0, sizeof(config));
void *img, *tmp;
size_t ttf_size;
size_t tmp_size, img_size;
const char *custom_data = "....";
char *ttf_blob = zr_common_file_load(path, &ttf_size);
/* setup font configuration */
memset(&config, 0, sizeof(config));
config.ttf_blob = ttf_blob; config.ttf_blob = ttf_blob;
config.ttf_size = ttf_size; config.ttf_size = ttf_size;
config.font = &baked_font; config.font = &baked_font;
config.coord_type = ZR_COORD_UV; config.coord_type = ZR_COORD_UV;
config.range = range; config.range = range;
config.pixel_snap = zr_false; config.pixel_snap = zr_false;
config.size = (float)font_height; config.size = (float)font_height;
config.spacing = zr_vec2(0,0); config.spacing = zr_vec2(0,0);
config.oversample_h = 1; config.oversample_h = 1;
config.oversample_v = 1; config.oversample_v = 1;
/* query needed amount of memory for the font baking process */ /* query needed amount of memory for the font baking process */
zr_font_bake_memory(&tmp_size, &glyph_count, &config, 1); zr_font_bake_memory(&tmp_size, &glyph_count, &config, 1);
glyphes = (struct zr_font_glyph*)
calloc(sizeof(struct zr_font_glyph), (size_t)glyph_count);
tmp = calloc(1, tmp_size);
/* pack all glyphes and return needed image width, height and memory size*/ glyphes = (struct zr_font_glyph*)
custom.w = 2; custom.h = 2; calloc(sizeof(struct zr_font_glyph), (size_t)glyph_count);
zr_font_bake_pack(&img_size, tmp = calloc(1, tmp_size);
&img_width,&img_height,&custom,tmp,tmp_size,&config, 1);
/* bake all glyphes and custom white pixel into image */ /* pack all glyphes and return needed image width, height and memory size*/
img = calloc(1, img_size); custom.w = 2;
zr_font_bake(img, img_width, custom.h = 2;
img_height, tmp, tmp_size, glyphes, glyph_count, &config, 1); zr_font_bake_pack(&img_size,
zr_font_bake_custom_data(img, &img_width,&img_height,&custom,tmp,tmp_size,&config, 1);
img_width, img_height, custom, custom_data, 2, 2, '.', 'X');
{ /* bake all glyphes and custom white pixel into image */
/* convert alpha8 image into rgba8 image */ img = calloc(1, img_size);
void *img_rgba = calloc(4, (size_t)(img_height * img_width)); zr_font_bake(img, img_width,
zr_font_bake_convert(img_rgba, img_width, img_height, img); img_height, tmp, tmp_size, glyphes, glyph_count, &config, 1);
free(img); zr_font_bake_custom_data(img,
img = img_rgba; img_width, img_height, custom, custom_data, 2, 2, '.', 'X');
}
/* upload baked font image */ /* convert alpha8 image into rgba8 image */
ti.pixels = (uint32_t*)img; img_rgba = calloc(4, (size_t)(img_height * img_width));
ti.width = (GLsizei)img_width; zr_font_bake_convert(img_rgba, img_width, img_height, img);
ti.height = (GLsizei)img_height;
video_driver_texture_load(&ti, free(img);
TEXTURE_FILTER_MIPMAP_NEAREST, (uintptr_t*)&dev->font_tex); img = img_rgba;
free(ttf_blob); /* upload baked font image */
free(tmp); ti.pixels = (uint32_t*)img;
free(img); ti.width = (GLsizei)img_width;
} ti.height = (GLsizei)img_height;
video_driver_texture_load(&ti,
TEXTURE_FILTER_MIPMAP_NEAREST, (uintptr_t*)&dev->font_tex);
free(ttf_blob);
free(tmp);
free(img);
/* default white pixel in a texture which is needed to draw primitives */ /* default white pixel in a texture which is needed to draw primitives */
dev->null.texture.id = (int)dev->font_tex; dev->null.texture.id = (int)dev->font_tex;
dev->null.uv = zr_vec2((custom.x + 0.5f)/(float)img_width, dev->null.uv = zr_vec2((custom.x + 0.5f) / (float)img_width,
(custom.y + 0.5f)/(float)img_height); (custom.y + 0.5f)/(float)img_height);
/* setup font with glyphes. IMPORTANT: the font only references the glyphes /* setup font with glyphes. IMPORTANT: the font only references the glyphes
this was done to have the possibility to have multible fonts with one this was done to have the possibility to have multible fonts with one