X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdraw%2Ffont-convert;h=8feafe528127fd0f1fc6a529636873a42331830d;hb=d9140ea0d6bf6755a2701115273f02a4c3944e17;hp=d295c181dc282898458bf95257174763929ed252;hpb=2f68d82238ff869b76b554fd8de61e3b6d06e8f9;p=fw%2Faltos diff --git a/src/draw/font-convert b/src/draw/font-convert index d295c181..8feafe52 100755 --- a/src/draw/font-convert +++ b/src/draw/font-convert @@ -106,7 +106,7 @@ void print_font(file out, font_t font, string font_name) { int height = font.glyphs[0].height; int max_width = width; int max_height = height; - int[128] pos = { -1 ... }; + int[128] pos = { 0 ... }; int[...] bytes; bool fixed_size = true; @@ -138,7 +138,7 @@ void print_font(file out, font_t font, string font_name) { if (pos[i] == -1) pos[i] = pos[font.default_char]; - fprintf(out, "#include \"ao_draw.h\"\n"); + fprintf(out, "#include \n"); fprintf(out, "static const uint8_t %s_bytes[%d] = {", font_name, dim(bytes)); for (int b = 0; b < dim(bytes); b++) { if ((b & 15) == 0) @@ -195,6 +195,8 @@ void print_font(file out, font_t font, string font_name) { fprintf(out, "\t.max_height = %d,\n", max_height); fprintf(out, "\t.ascent = %d,\n", font.ascent); fprintf(out, "};\n"); + int max_stride = (max_width + 31) >> 5; + fprintf(out, "__asm__(\".balign 4\\n.comm ao_glyph_temp 0x%x\");\n", max_stride * max_height * 4); } string