X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=ft2.c;h=269cb11780c5e94930ad91f23e455675d63810df;hp=47958d74312de44e2af10f8baea9c7558331fcde;hb=bdbc7672b5ef00f204f341c95a601f5e71e9e8e0;hpb=179be6fd1f715bac570e73aa9cadb0e08d0f7979 diff --git a/ft2.c b/ft2.c index 47958d74..269cb117 100644 --- a/ft2.c +++ b/ft2.c @@ -6,6 +6,7 @@ #include "ft2.h" #include "ft2_defs.h" #include "ft2_fontdefs.h" +#include "image.h" static int img_fontmap[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -36,6 +37,9 @@ cvar_t r_font_disable_freetype = {CVAR_SAVE, "r_font_disable_freetype", "1", "di cvar_t r_font_use_alpha_textures = {CVAR_SAVE, "r_font_use_alpha_textures", "0", "use alpha-textures for font rendering, this should safe memory"}; cvar_t r_font_size_snapping = {CVAR_SAVE, "r_font_size_snapping", "1", "stick to good looking font sizes whenever possible - bad when the mod doesn't support it!"}; cvar_t r_font_kerning = {CVAR_SAVE, "r_font_kerning", "1", "Use kerning if available"}; +cvar_t r_font_diskcache = {CVAR_SAVE, "r_font_diskcache", "0", "save font textures to disk for future loading rather than generating them every time"}; +cvar_t r_font_compress = {CVAR_SAVE, "r_font_compress", "0", "use texture compression on font textures to save video memory"}; +cvar_t r_font_nonpoweroftwo = {CVAR_SAVE, "r_font_nonpoweroftwo", "1", "use nonpoweroftwo textures for font (saves memory, potentially slower)"}; cvar_t developer_font = {CVAR_SAVE, "developer_font", "0", "prints debug messages about fonts"}; /* @@ -134,7 +138,6 @@ static dllhandle_t ft2_dll = NULL; /// Memory pool for fonts static mempool_t *font_mempool= NULL; -static rtexturepool_t *font_texturepool = NULL; /// FreeType library handle static FT_Library font_ft2lib = NULL; @@ -152,6 +155,79 @@ typedef struct font_postprocess_t; static font_postprocess_t pp; +typedef struct fontfilecache_s +{ + unsigned char *buf; + fs_offset_t len; + int refcount; + char path[MAX_QPATH]; +} +fontfilecache_t; +#define MAX_FONTFILES 8 +static fontfilecache_t fontfiles[MAX_FONTFILES]; +static const unsigned char *fontfilecache_LoadFile(const char *path, qboolean quiet, fs_offset_t *filesizepointer) +{ + int i; + unsigned char *buf; + + for(i = 0; i < MAX_FONTFILES; ++i) + { + if(fontfiles[i].refcount > 0) + if(!strcmp(path, fontfiles[i].path)) + { + *filesizepointer = fontfiles[i].len; + ++fontfiles[i].refcount; + return fontfiles[i].buf; + } + } + + buf = FS_LoadFile(path, font_mempool, quiet, filesizepointer); + if(buf) + { + for(i = 0; i < MAX_FONTFILES; ++i) + if(fontfiles[i].refcount <= 0) + { + strlcpy(fontfiles[i].path, path, sizeof(fontfiles[i].path)); + fontfiles[i].len = *filesizepointer; + fontfiles[i].buf = buf; + fontfiles[i].refcount = 1; + return buf; + } + } + + return buf; +} +static void fontfilecache_Free(const unsigned char *buf) +{ + int i; + for(i = 0; i < MAX_FONTFILES; ++i) + { + if(fontfiles[i].refcount > 0) + if(fontfiles[i].buf == buf) + { + if(--fontfiles[i].refcount <= 0) + { + Mem_Free(fontfiles[i].buf); + fontfiles[i].buf = NULL; + } + return; + } + } + // if we get here, it used regular allocation + Mem_Free((void *) buf); +} +static void fontfilecache_FreeAll(void) +{ + int i; + for(i = 0; i < MAX_FONTFILES; ++i) + { + if(fontfiles[i].refcount > 0) + Mem_Free(fontfiles[i].buf); + fontfiles[i].buf = NULL; + fontfiles[i].refcount = 0; + } +} + /* ==================== Font_CloseLibrary @@ -161,10 +237,9 @@ Unload the FreeType2 DLL */ void Font_CloseLibrary (void) { + fontfilecache_FreeAll(); if (font_mempool) Mem_FreePool(&font_mempool); - if (font_texturepool) - R_FreeTexturePool(&font_texturepool); if (font_ft2lib && qFT_Done_FreeType) { qFT_Done_FreeType(font_ft2lib); @@ -238,14 +313,6 @@ void font_start(void) Font_CloseLibrary(); return; } - - font_texturepool = R_AllocTexturePool(); - if (!font_texturepool) - { - Con_Print("ERROR: Failed to allocate FONT texture pool!\n"); - Font_CloseLibrary(); - return; - } } void font_shutdown(void) @@ -268,10 +335,13 @@ void font_newmap(void) void Font_Init(void) { + Cvar_RegisterVariable(&r_font_nonpoweroftwo); Cvar_RegisterVariable(&r_font_disable_freetype); Cvar_RegisterVariable(&r_font_use_alpha_textures); Cvar_RegisterVariable(&r_font_size_snapping); Cvar_RegisterVariable(&r_font_kerning); + Cvar_RegisterVariable(&r_font_diskcache); + Cvar_RegisterVariable(&r_font_compress); Cvar_RegisterVariable(&developer_font); // let's open it at startup already @@ -387,9 +457,13 @@ qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt) if (!Font_LoadFile(dpfnt->fallbacks[i], dpfnt->fallback_faces[i], &dpfnt->settings, fb)) { - Con_Printf("Failed to allocate font for fallback %i of font %s\n", i, name); + if(!FS_FileExists(va("%s.tga", dpfnt->fallbacks[i]))) + if(!FS_FileExists(va("%s.png", dpfnt->fallbacks[i]))) + if(!FS_FileExists(va("%s.jpg", dpfnt->fallbacks[i]))) + if(!FS_FileExists(va("%s.pcx", dpfnt->fallbacks[i]))) + Con_Printf("Failed to load font %s for fallback %i of font %s\n", dpfnt->fallbacks[i], i, name); Mem_Free(fb); - break; + continue; } count = 0; for (s = 0; s < MAX_FONT_SIZES && dpfnt->req_sizes[s] >= 0; ++s) @@ -444,7 +518,7 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti char filename[MAX_QPATH]; int status; size_t i; - unsigned char *data; + const unsigned char *data; fs_offset_t datasize; memset(font, 0, sizeof(*font)); @@ -466,18 +540,18 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti // try load direct file memcpy(filename, name, namelen+1); - data = FS_LoadFile(filename, font_mempool, false, &datasize); + data = fontfilecache_LoadFile(filename, false, &datasize); // try load .ttf if (!data) { memcpy(filename + namelen, ".ttf", 5); - data = FS_LoadFile(filename, font_mempool, false, &datasize); + data = fontfilecache_LoadFile(filename, false, &datasize); } // try load .otf if (!data) { memcpy(filename + namelen, ".otf", 5); - data = FS_LoadFile(filename, font_mempool, false, &datasize); + data = fontfilecache_LoadFile(filename, false, &datasize); } // try load .pfb/afm if (!data) @@ -485,12 +559,12 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti ft2_attachment_t afm; memcpy(filename + namelen, ".pfb", 5); - data = FS_LoadFile(filename, font_mempool, false, &datasize); + data = fontfilecache_LoadFile(filename, false, &datasize); if (data) { memcpy(filename + namelen, ".afm", 5); - afm.data = FS_LoadFile(filename, font_mempool, false, &afm.size); + afm.data = fontfilecache_LoadFile(filename, false, &afm.size); if (afm.data) Font_Attach(font, &afm); @@ -595,11 +669,13 @@ void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h) void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int bpp, int w, int h, int *pad_l, int *pad_r, int *pad_t, int *pad_b) { int x, y; + + // calculate gauss table Font_Postprocess_Update(fnt, bpp, w, h); + if(imagedata) { // enlarge buffer - // perform operation, not exceeding the passed padding values, // but possibly reducing them *pad_l = min(*pad_l, pp.padding_l); @@ -607,8 +683,6 @@ void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int *pad_t = min(*pad_t, pp.padding_t); *pad_b = min(*pad_b, pp.padding_b); - // calculate gauss table - // outline the font (RGBA only) if(bpp == 4 && (pp.outline > 0 || pp.blur > 0 || pp.shadowx != 0 || pp.shadowy != 0 || pp.shadowz != 0)) // we can only do this in BGRA { @@ -695,6 +769,15 @@ void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int } } } + else if(pitch) + { + // perform operation, not exceeding the passed padding values, + // but possibly reducing them + *pad_l = min(*pad_l, pp.padding_l); + *pad_r = min(*pad_r, pp.padding_r); + *pad_t = min(*pad_t, pp.padding_t); + *pad_b = min(*pad_b, pp.padding_b); + } else { // just calculate parameters @@ -747,7 +830,9 @@ static qboolean Font_LoadSize(ft2_font_t *font, float size, qboolean check_only) memset(&temp, 0, sizeof(temp)); temp.size = size; - temp.glyphSize = CeilPowerOf2(size*2 + max(gpad_l + gpad_r, gpad_t + gpad_b)); + temp.glyphSize = size*2 + max(gpad_l + gpad_r, gpad_t + gpad_b); + if (!(r_font_nonpoweroftwo.integer && vid.support.arb_texture_non_power_of_two)) + temp.glyphSize = CeilPowerOf2(temp.glyphSize); temp.sfx = (1.0/64.0)/(double)size; temp.sfy = (1.0/64.0)/(double)size; temp.intSize = -1; // negative value: LoadMap must search now :) @@ -795,8 +880,8 @@ static qboolean Font_LoadSize(ft2_font_t *font, float size, qboolean check_only) int Font_IndexForSize(ft2_font_t *font, float _fsize, float *outw, float *outh) { int match = -1; - int value = 1000000; - int nval; + float value = 1000000; + float nval; int matchsize = -10000; int m; float fsize_x, fsize_y; @@ -826,7 +911,7 @@ int Font_IndexForSize(ft2_font_t *font, float _fsize, float *outw, float *outh) if (!maps[m]) continue; // "round up" to the bigger size if two equally-valued matches exist - nval = 0.5 * (abs(maps[m]->size - fsize_x) + abs(maps[m]->size - fsize_y)); + nval = 0.5 * (fabs(maps[m]->size - fsize_x) + fabs(maps[m]->size - fsize_y)); if (match == -1 || nval < value || (nval == value && matchsize < maps[m]->size)) { value = nval; @@ -943,10 +1028,10 @@ qboolean Font_GetKerningForSize(ft2_font_t *font, float w, float h, Uchar left, static void UnloadMapRec(ft2_font_map_t *map) { - if (map->texture) + if (map->pic) { - R_FreeTexture(map->texture); - map->texture = NULL; + //Draw_FreePic(map->pic); // FIXME: refcounting needed... + map->pic = NULL; } if (map->next) UnloadMapRec(map->next); @@ -956,11 +1041,16 @@ static void UnloadMapRec(ft2_font_map_t *map) void Font_UnloadFont(ft2_font_t *font) { int i; + + // unload fallbacks + if(font->next) + Font_UnloadFont(font->next); + if (font->attachments && font->attachmentcount) { - for (i = 0; i < font->attachmentcount; ++i) { + for (i = 0; i < (int)font->attachmentcount; ++i) { if (font->attachments[i].data) - Mem_Free(font->attachments[i].data); + fontfilecache_Free(font->attachments[i].data); } Mem_Free(font->attachments); font->attachmentcount = 0; @@ -983,7 +1073,7 @@ void Font_UnloadFont(ft2_font_t *font) } } if (font->data) { - Mem_Free(font->data); + fontfilecache_Free(font->data); font->data = NULL; } } @@ -1013,7 +1103,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ { char map_identifier[MAX_QPATH]; unsigned long mapidx = _ch / FONT_CHARS_PER_MAP; - unsigned char *data; + unsigned char *data = NULL; FT_ULong ch, mapch; int status; int tp; @@ -1123,6 +1213,29 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ return false; } + // create a totally unique name for this map, then we will use it to make a unique cachepic_t to avoid redundant textures + dpsnprintf(map_identifier, sizeof(map_identifier), + "%s_cache_%g_%d_%g_%g_%g_%g_%g_%u", + font->name, + (double) mapstart->intSize, + (int) load_flags, + (double) font->settings->blur, + (double) font->settings->outline, + (double) font->settings->shadowx, + (double) font->settings->shadowy, + (double) font->settings->shadowz, + (unsigned) mapidx); + + // create a cachepic_t from the data now, or reuse an existing one + map->pic = Draw_CachePic_Flags(map_identifier, CACHEPICFLAG_QUIET); + if (developer_font.integer) + { + if (map->pic->tex == r_texture_notexture) + Con_Printf("Generating font map %s (size: %.1f MB)\n", map_identifier, mapstart->glyphSize * (256 * 4 / 1048576.0) * mapstart->glyphSize); + else + Con_Printf("Using cached font map %s (size: %.1f MB)\n", map_identifier, mapstart->glyphSize * (256 * 4 / 1048576.0) * mapstart->glyphSize); + } + Font_Postprocess(font, NULL, 0, bytesPerPixel, mapstart->size*2, mapstart->size*2, &gpad_l, &gpad_r, &gpad_t, &gpad_b); // copy over the information @@ -1133,28 +1246,31 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ map->sfy = mapstart->sfy; pitch = map->glyphSize * FONT_CHARS_PER_LINE * bytesPerPixel; - data = (unsigned char *)Mem_Alloc(font_mempool, (FONT_CHAR_LINES * map->glyphSize) * pitch); - if (!data) + if (map->pic->tex == r_texture_notexture) { - Con_Printf("ERROR: Failed to allocate memory for font %s size %g\n", font->name, map->size); - Mem_Free(map); - return false; - } - memset(map->width_of, 0, sizeof(map->width_of)); - - // initialize as white texture with zero alpha - tp = 0; - while (tp < (FONT_CHAR_LINES * map->glyphSize) * pitch) - { - if (bytesPerPixel == 4) + data = (unsigned char *)Mem_Alloc(font_mempool, (FONT_CHAR_LINES * map->glyphSize) * pitch); + if (!data) + { + Con_Printf("ERROR: Failed to allocate memory for font %s size %g\n", font->name, map->size); + Mem_Free(map); + return false; + } + // initialize as white texture with zero alpha + tp = 0; + while (tp < (FONT_CHAR_LINES * map->glyphSize) * pitch) { - data[tp++] = 0xFF; - data[tp++] = 0xFF; - data[tp++] = 0xFF; + if (bytesPerPixel == 4) + { + data[tp++] = 0xFF; + data[tp++] = 0xFF; + data[tp++] = 0xFF; + } + data[tp++] = 0x00; } - data[tp++] = 0x00; } + memset(map->width_of, 0, sizeof(map->width_of)); + // insert the map map->start = mapidx * FONT_CHARS_PER_MAP; next = mapstart; @@ -1173,7 +1289,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ int w, h, x, y; FT_GlyphSlot glyph; FT_Bitmap *bmp; - unsigned char *imagedata, *dst, *src; + unsigned char *imagedata = NULL, *dst, *src; glyph_slot_t *mapglyph; FT_Face face; int pad_l, pad_r, pad_t, pad_b; @@ -1190,8 +1306,11 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ ++gR; } - imagedata = data + gR * pitch * map->glyphSize + gC * map->glyphSize * bytesPerPixel; - imagedata += gpad_t * pitch + gpad_l * bytesPerPixel; + if (data) + { + imagedata = data + gR * pitch * map->glyphSize + gC * map->glyphSize * bytesPerPixel; + imagedata += gpad_t * pitch + gpad_l * bytesPerPixel; + } //status = qFT_Load_Char(face, ch, FT_LOAD_RENDER); // we need the glyphIndex face = (FT_Face)font->face; @@ -1256,91 +1375,103 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ h = map->glyphSize; } - switch (bmp->pixel_mode) - { - case FT_PIXEL_MODE_MONO: - if (developer_font.integer) - Con_DPrint("glyphinfo: Pixel Mode: MONO\n"); - break; - case FT_PIXEL_MODE_GRAY2: - if (developer_font.integer) - Con_DPrint("glyphinfo: Pixel Mode: GRAY2\n"); - break; - case FT_PIXEL_MODE_GRAY4: - if (developer_font.integer) - Con_DPrint("glyphinfo: Pixel Mode: GRAY4\n"); - break; - case FT_PIXEL_MODE_GRAY: - if (developer_font.integer) - Con_DPrint("glyphinfo: Pixel Mode: GRAY\n"); - break; - default: - if (developer_font.integer) - Con_DPrintf("glyphinfo: Pixel Mode: Unknown: %i\n", bmp->pixel_mode); - Mem_Free(data); - Con_Printf("ERROR: Unrecognized pixel mode for font %s size %f: %i\n", font->name, mapstart->size, bmp->pixel_mode); - return false; - } - for (y = 0; y < h; ++y) + if (imagedata) { - dst = imagedata + y * pitch; - src = bmp->buffer + y * bmp->pitch; - switch (bmp->pixel_mode) { case FT_PIXEL_MODE_MONO: - dst += bytesPerPixel - 1; // shift to alpha byte - for (x = 0; x < bmp->width; x += 8) - { - unsigned char ch = *src++; - *dst = 255 * !!((ch & 0x80) >> 7); dst += bytesPerPixel; - *dst = 255 * !!((ch & 0x40) >> 6); dst += bytesPerPixel; - *dst = 255 * !!((ch & 0x20) >> 5); dst += bytesPerPixel; - *dst = 255 * !!((ch & 0x10) >> 4); dst += bytesPerPixel; - *dst = 255 * !!((ch & 0x08) >> 3); dst += bytesPerPixel; - *dst = 255 * !!((ch & 0x04) >> 2); dst += bytesPerPixel; - *dst = 255 * !!((ch & 0x02) >> 1); dst += bytesPerPixel; - *dst = 255 * !!((ch & 0x01) >> 0); dst += bytesPerPixel; - } + if (developer_font.integer) + Con_DPrint("glyphinfo: Pixel Mode: MONO\n"); break; case FT_PIXEL_MODE_GRAY2: - dst += bytesPerPixel - 1; // shift to alpha byte - for (x = 0; x < bmp->width; x += 4) - { - unsigned char ch = *src++; - *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; - *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; - *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; - *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; - } + if (developer_font.integer) + Con_DPrint("glyphinfo: Pixel Mode: GRAY2\n"); break; case FT_PIXEL_MODE_GRAY4: - dst += bytesPerPixel - 1; // shift to alpha byte - for (x = 0; x < bmp->width; x += 2) - { - unsigned char ch = *src++; - *dst = ( ((ch & 0xF0) >> 4) * 0x11); dst += bytesPerPixel; - *dst = ( ((ch & 0x0F) ) * 0x11); dst += bytesPerPixel; - } + if (developer_font.integer) + Con_DPrint("glyphinfo: Pixel Mode: GRAY4\n"); break; case FT_PIXEL_MODE_GRAY: - // in this case pitch should equal width - for (tp = 0; tp < bmp->pitch; ++tp) - dst[(bytesPerPixel - 1) + tp*bytesPerPixel] = src[tp]; // copy the grey value into the alpha bytes - - //memcpy((void*)dst, (void*)src, bmp->pitch); - //dst += bmp->pitch; + if (developer_font.integer) + Con_DPrint("glyphinfo: Pixel Mode: GRAY\n"); break; default: - break; + if (developer_font.integer) + Con_DPrintf("glyphinfo: Pixel Mode: Unknown: %i\n", bmp->pixel_mode); + Mem_Free(data); + Con_Printf("ERROR: Unrecognized pixel mode for font %s size %f: %i\n", font->name, mapstart->size, bmp->pixel_mode); + return false; } + for (y = 0; y < h; ++y) + { + dst = imagedata + y * pitch; + src = bmp->buffer + y * bmp->pitch; + + switch (bmp->pixel_mode) + { + case FT_PIXEL_MODE_MONO: + dst += bytesPerPixel - 1; // shift to alpha byte + for (x = 0; x < bmp->width; x += 8) + { + unsigned char ch = *src++; + *dst = 255 * !!((ch & 0x80) >> 7); dst += bytesPerPixel; + *dst = 255 * !!((ch & 0x40) >> 6); dst += bytesPerPixel; + *dst = 255 * !!((ch & 0x20) >> 5); dst += bytesPerPixel; + *dst = 255 * !!((ch & 0x10) >> 4); dst += bytesPerPixel; + *dst = 255 * !!((ch & 0x08) >> 3); dst += bytesPerPixel; + *dst = 255 * !!((ch & 0x04) >> 2); dst += bytesPerPixel; + *dst = 255 * !!((ch & 0x02) >> 1); dst += bytesPerPixel; + *dst = 255 * !!((ch & 0x01) >> 0); dst += bytesPerPixel; + } + break; + case FT_PIXEL_MODE_GRAY2: + dst += bytesPerPixel - 1; // shift to alpha byte + for (x = 0; x < bmp->width; x += 4) + { + unsigned char ch = *src++; + *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; + *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; + *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; + *dst = ( ((ch & 0xA0) >> 6) * 0x55 ); ch <<= 2; dst += bytesPerPixel; + } + break; + case FT_PIXEL_MODE_GRAY4: + dst += bytesPerPixel - 1; // shift to alpha byte + for (x = 0; x < bmp->width; x += 2) + { + unsigned char ch = *src++; + *dst = ( ((ch & 0xF0) >> 4) * 0x11); dst += bytesPerPixel; + *dst = ( ((ch & 0x0F) ) * 0x11); dst += bytesPerPixel; + } + break; + case FT_PIXEL_MODE_GRAY: + // in this case pitch should equal width + for (tp = 0; tp < bmp->pitch; ++tp) + dst[(bytesPerPixel - 1) + tp*bytesPerPixel] = src[tp]; // copy the grey value into the alpha bytes + + //memcpy((void*)dst, (void*)src, bmp->pitch); + //dst += bmp->pitch; + break; + default: + break; + } + } + + pad_l = gpad_l; + pad_r = gpad_r; + pad_t = gpad_t; + pad_b = gpad_b; + Font_Postprocess(font, imagedata, pitch, bytesPerPixel, w, h, &pad_l, &pad_r, &pad_t, &pad_b); + } + else + { + pad_l = gpad_l; + pad_r = gpad_r; + pad_t = gpad_t; + pad_b = gpad_b; + Font_Postprocess(font, NULL, pitch, bytesPerPixel, w, h, &pad_l, &pad_r, &pad_t, &pad_b); } - pad_l = gpad_l; - pad_r = gpad_r; - pad_t = gpad_t; - pad_b = gpad_b; - Font_Postprocess(font, imagedata, pitch, bytesPerPixel, w, h, &pad_l, &pad_r, &pad_t, &pad_b); // now fill map->glyphs[ch - map->start] mapglyph = &map->glyphs[mapch]; @@ -1391,33 +1522,41 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ map->glyphs[mapch].image = false; } - // create a texture from the data now - - if (developer_font.integer > 100) + if (map->pic->tex == r_texture_notexture) { - // LordHavoc: why are we writing this? And why not write it as TGA using the appropriate function? - // view using `display -depth 8 -size 512x512 name_page.rgba` (be sure to use a correct -size parameter) - dpsnprintf(map_identifier, sizeof(map_identifier), "%s_%u.rgba", font->name, (unsigned)map->start/FONT_CHARS_PER_MAP); - FS_WriteFile(map_identifier, data, pitch * FONT_CHAR_LINES * map->glyphSize); + int w = map->glyphSize * FONT_CHARS_PER_LINE; + int h = map->glyphSize * FONT_CHAR_LINES; + rtexture_t *tex; + // abuse the Draw_CachePic system to keep track of this texture + tex = R_LoadTexture2D(drawtexturepool, map_identifier, w, h, data, r_font_use_alpha_textures.integer ? TEXTYPE_ALPHA : TEXTYPE_RGBA, TEXF_ALPHA | (r_font_compress.integer > 0 ? TEXF_COMPRESS : 0), -1, NULL); + // if tex is NULL for any reason, the pic->tex will remain set to r_texture_notexture + if (tex) + map->pic->tex = tex; + + if (r_font_diskcache.integer >= 1) + { + // swap to BGRA for tga writing... + int s = w * h; + int x; + int b; + for (x = 0;x < s;x++) + { + b = data[x*4+0]; + data[x*4+0] = data[x*4+2]; + data[x*4+2] = b; + } + Image_WriteTGABGRA(va("%s.tga", map_identifier), w, h, data); +#ifndef USE_GLES2 + if (r_font_compress.integer && qglGetCompressedTexImageARB && tex) + R_SaveTextureDDSFile(tex, va("dds/%s.dds", map_identifier), r_texture_dds_save.integer < 2, true); +#endif + } } - dpsnprintf(map_identifier, sizeof(map_identifier), "%s_%u", font->name, (unsigned)map->start/FONT_CHARS_PER_MAP); - // probably use bytesPerPixel here instead? - if (r_font_use_alpha_textures.integer) - { - map->texture = R_LoadTexture2D(font_texturepool, map_identifier, - map->glyphSize * FONT_CHARS_PER_LINE, - map->glyphSize * FONT_CHAR_LINES, - data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL); - } else { - map->texture = R_LoadTexture2D(font_texturepool, map_identifier, - map->glyphSize * FONT_CHARS_PER_LINE, - map->glyphSize * FONT_CHAR_LINES, - data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL); - } + if(data) + Mem_Free(data); - Mem_Free(data); - if (!map->texture) + if (map->pic->tex == r_texture_notexture) { // if the first try isn't successful, keep it with a broken texture // otherwise we retry to load it every single frame where ft2 rendering is used