Fix a typo in DrawQ_RotPic which broke it badly.

[xonotic/darkplaces.git] / ft2.c

diff --git a/ft2.c b/ft2.c
index e30c22e6969f3d26dc73bfd0654c8567585be675..3671c8b1370d97fcd1beeb580162a4c99d77215e 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -1329,14 +1329,8 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                (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);
-       }
+               Con_Printf("Generating 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);
 
@@ -1348,27 +1342,24 @@ 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)
+       data = (unsigned char *)Mem_Alloc(font_mempool, (FONT_CHAR_LINES * map->glyphSize) * pitch);
+       if (!data)
        {
-               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)
+               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)
+       {
+               if (bytesPerPixel == 4)
                {
-                       if (bytesPerPixel == 4)
-                       {
-                               data[tp++] = 0xFF;
-                               data[tp++] = 0xFF;
-                               data[tp++] = 0xFF;
-                       }
-                       data[tp++] = 0x00;
+                       data[tp++] = 0xFF;
+                       data[tp++] = 0xFF;
+                       data[tp++] = 0xFF;
                }
+               data[tp++] = 0x00;
        }
 
        memset(map->width_of, 0, sizeof(map->width_of));
@@ -1624,16 +1615,11 @@ 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)
        {
                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
+               map->pic = 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 +1635,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 +1644,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