Fix multiple bugs with ft2 font loading that were caused by the switch to cachepic...

R_Skinframe_LoadExternal now uses comparecrc = -1 to allow the shader loading to find the skinframe for an ft2 font.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12405 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/ft2.c b/ft2.c
index 6ae09792ae72b73a04eeba1e5cc1296242c0b0a4..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 (!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);
-       }
+               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 (!Draw_IsPicLoaded(map->pic))
+       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,12 +1615,11 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                map->glyphs[mapch].image = false;
        }
 
-       if (!Draw_IsPicLoaded(map->pic))
        {
                int w = map->glyphSize * FONT_CHARS_PER_LINE;
                int h = map->glyphSize * FONT_CHAR_LINES;
                // 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));
+               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)
                {

diff --git a/gl_draw.c b/gl_draw.c
index 55c0bd4c69f556fc7fe54954fbdbdc4bc18997ee..0b15ad291e024bcb3b80383a31f5cddc294beb14 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -148,7 +148,7 @@ reload:
        pic->lastusedframe = draw_frame;
 
        // load high quality image (this falls back to low quality too)
-       pic->skinframe = R_SkinFrame_LoadExternal(pic->name, texflags, (cachepicflags & CACHEPICFLAG_QUIET) == 0, (cachepicflags & CACHEPICFLAG_FAILONMISSING) == 0);
+       pic->skinframe = R_SkinFrame_LoadExternal(pic->name, texflags | TEXF_FORCE_RELOAD, (cachepicflags & CACHEPICFLAG_QUIET) == 0, (cachepicflags & CACHEPICFLAG_FAILONMISSING) == 0);
 
        // get the dimensions of the image we loaded (if it was successful)
        if (pic->skinframe && pic->skinframe->base)
@@ -194,7 +194,7 @@ qboolean Draw_IsPicLoaded(cachepic_t *pic)
        if (pic == NULL)
                return false;
        if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
-               pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags, false, true);
+               pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags | TEXF_FORCE_RELOAD, false, true);
        // skinframe will only be NULL if the pic was created with CACHEPICFLAG_FAILONMISSING and not found
        return pic->skinframe != NULL && pic->skinframe->base != NULL;
 }
@@ -204,7 +204,7 @@ rtexture_t *Draw_GetPicTexture(cachepic_t *pic)
        if (pic == NULL)
                return NULL;
        if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
-               pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags, false, true);
+               pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags | TEXF_FORCE_RELOAD, false, true);
        pic->lastusedframe = draw_frame;
        return pic->skinframe ? pic->skinframe->base : NULL;
 }
@@ -267,7 +267,7 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, unsigned cha
        pic->flags |= (texflags & TEXF_FORCENEAREST) ? CACHEPICFLAG_NEAREST : 0;
        pic->width = width;
        pic->height = height;
-       pic->skinframe = R_SkinFrame_LoadInternalBGRA(picname, texflags, pixels_bgra, width, height, vid.sRGB2D);
+       pic->skinframe = R_SkinFrame_LoadInternalBGRA(picname, texflags | TEXF_FORCE_RELOAD, pixels_bgra, width, height, vid.sRGB2D);
        pic->lastusedframe = draw_frame;
        return pic;
 }

diff --git a/gl_rmain.c b/gl_rmain.c
index 0b4a32f7b96fb94e3f737de4302c583527803f89..6fc785266ad7a84cecd634d66e42fc050ba47451 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2151,6 +2151,8 @@ void R_SkinFrame_MarkUsed(skinframe_t *skinframe)
 
 void R_SkinFrame_PurgeSkinFrame(skinframe_t *s)
 {
+       if (s == NULL)
+               return;
        if (s->merged == s->base)
                s->merged = NULL;
        R_PurgeTexture(s->stain); s->stain = NULL;
@@ -2301,7 +2303,7 @@ skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboole
        // return an existing skinframe if already loaded
        // if loading of the first image fails, don't make a new skinframe as it
        // would cause all future lookups of this to be missing
-       skinframe = R_SkinFrame_Find(name, textureflags, 0, 0, 0, false);
+       skinframe = R_SkinFrame_Find(name, textureflags, 0, 0, -1, false);
        if (skinframe && skinframe->base)
                return skinframe;