convert lightmaps to sRGB for nice sRGB support

[xonotic/darkplaces.git] / ft2.c

diff --git a/ft2.c b/ft2.c
index 0b34f5294c0bbc56622785f2f680341ad4f53484..269cb11780c5e94930ad91f23e455675d63810df 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -39,6 +39,7 @@ cvar_t r_font_size_snapping = {CVAR_SAVE, "r_font_size_snapping", "1", "stick to
 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"};
 
 /*
@@ -334,6 +335,7 @@ 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);
@@ -667,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);
@@ -679,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
                {
@@ -767,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
@@ -819,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 :)
@@ -1204,17 +1217,24 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
        dpsnprintf(map_identifier, sizeof(map_identifier),
                "%s_cache_%g_%d_%g_%g_%g_%g_%g_%u",
                font->name,
-               mapstart->intSize,
-               load_flags,
-               font->settings->blur,
-               font->settings->outline,
-               font->settings->shadowx,
-               font->settings->shadowy,
-               font->settings->shadowz,
-               (unsigned)map->start/FONT_CHARS_PER_MAP);
+               (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);
 
@@ -1443,6 +1463,15 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                        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);
+               }
+
 
                // now fill map->glyphs[ch - map->start]
                mapglyph = &map->glyphs[mapch];
@@ -1493,7 +1522,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                map->glyphs[mapch].image = false;
        }
 
-       if (data)
+       if (map->pic->tex == r_texture_notexture)
        {
                int w = map->glyphSize * FONT_CHARS_PER_LINE;
                int h = map->glyphSize * FONT_CHAR_LINES;
@@ -1517,12 +1546,16 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                                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), true, true);
+                               R_SaveTextureDDSFile(tex, va("dds/%s.dds", map_identifier), r_texture_dds_save.integer < 2, true);
+#endif
                }
-               Mem_Free(data);
        }
 
+       if(data)
+               Mem_Free(data);
+
        if (map->pic->tex == r_texture_notexture)
        {
                // if the first try isn't successful, keep it with a broken texture