Made RENDERPATH_GL20 require fbo support and always use it.

[xonotic/darkplaces.git] / ft2.c

diff --git a/ft2.c b/ft2.c
index bc9544f2153f6f345083ce2ea35f47d000e714e0..6ae09792ae72b73a04eeba1e5cc1296242c0b0a4 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -1332,7 +1332,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
        map->pic = Draw_CachePic_Flags(map_identifier, CACHEPICFLAG_QUIET);
        if (developer_font.integer)
        {
-               if (map->pic->tex == r_texture_notexture)
+               if (!Draw_IsPicLoaded(map->pic))
                        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);
@@ -1348,7 +1348,7 @@ 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;
-       if (map->pic->tex == r_texture_notexture)
+       if (!Draw_IsPicLoaded(map->pic))
        {
                data = (unsigned char *)Mem_Alloc(font_mempool, (FONT_CHAR_LINES * map->glyphSize) * pitch);
                if (!data)
@@ -1515,35 +1515,35 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                                        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;
+                                               unsigned char c = *src++;
+                                               *dst = 255 * !!((c & 0x80) >> 7); dst += bytesPerPixel;
+                                               *dst = 255 * !!((c & 0x40) >> 6); dst += bytesPerPixel;
+                                               *dst = 255 * !!((c & 0x20) >> 5); dst += bytesPerPixel;
+                                               *dst = 255 * !!((c & 0x10) >> 4); dst += bytesPerPixel;
+                                               *dst = 255 * !!((c & 0x08) >> 3); dst += bytesPerPixel;
+                                               *dst = 255 * !!((c & 0x04) >> 2); dst += bytesPerPixel;
+                                               *dst = 255 * !!((c & 0x02) >> 1); dst += bytesPerPixel;
+                                               *dst = 255 * !!((c & 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;
+                                               unsigned char c = *src++;
+                                               *dst = ( ((c & 0xA0) >> 6) * 0x55 ); c <<= 2; dst += bytesPerPixel;
+                                               *dst = ( ((c & 0xA0) >> 6) * 0x55 ); c <<= 2; dst += bytesPerPixel;
+                                               *dst = ( ((c & 0xA0) >> 6) * 0x55 ); c <<= 2; dst += bytesPerPixel;
+                                               *dst = ( ((c & 0xA0) >> 6) * 0x55 ); c <<= 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;
+                                               unsigned char c = *src++;
+                                               *dst = ( ((c & 0xF0) >> 4) * 0x11); dst += bytesPerPixel;
+                                               *dst = ( ((c & 0x0F) ) * 0x11); dst += bytesPerPixel;
                                        }
                                        break;
                                case FT_PIXEL_MODE_GRAY:
@@ -1624,16 +1624,12 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                map->glyphs[mapch].image = false;
        }
 
-       if (map->pic->tex == r_texture_notexture)
+       if (!Draw_IsPicLoaded(map->pic))
        {
                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;
+               // update the pic returned by Draw_CachePic_Flags earlier to contain our texture
+               Draw_NewPic(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));
 
                if (r_font_diskcache.integer >= 1)
                {
@@ -1649,8 +1645,8 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                        }
                        Image_WriteTGABGRA(va(vabuf, sizeof(vabuf), "%s.tga", map_identifier), w, h, data);
 #ifndef USE_GLES2
-                       if (r_font_compress.integer && qglGetCompressedTexImageARB && tex)
-                               R_SaveTextureDDSFile(tex, va(vabuf, sizeof(vabuf), "dds/%s.dds", map_identifier), r_texture_dds_save.integer < 2, true);
+                       if (r_font_compress.integer && qglGetCompressedTexImageARB && Draw_IsPicLoaded(map->pic))
+                               R_SaveTextureDDSFile(Draw_GetPicTexture(map->pic), va(vabuf, sizeof(vabuf), "dds/%s.dds", map_identifier), r_texture_dds_save.integer < 2, true);
 #endif
                }
        }
@@ -1658,7 +1654,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
        if(data)
                Mem_Free(data);
 
-       if (map->pic->tex == r_texture_notexture)
+       if (!Draw_IsPicLoaded(map->pic))
        {
                // 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