Remove a duplicate definition of qglGetPointerv.

[xonotic/darkplaces.git] / ft2.c

diff --git a/ft2.c b/ft2.c
index 3671c8b1370d97fcd1beeb580162a4c99d77215e..c8d7476471e15e4acb388ee62d0e9ad926dc1daa 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -928,7 +928,7 @@ static qboolean Font_LoadSize(ft2_font_t *font, float size, qboolean check_only)
        memset(&temp, 0, sizeof(temp));
        temp.size = size;
        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))
+       if (!r_font_nonpoweroftwo.integer)
                temp.glyphSize = CeilPowerOf2(temp.glyphSize);
        temp.sfx = (1.0/64.0)/(double)size;
        temp.sfy = (1.0/64.0)/(double)size;
@@ -1619,7 +1619,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                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
-               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));
+               map->pic = Draw_NewPic(map_identifier, w, h, data, r_font_use_alpha_textures.integer ? TEXTYPE_ALPHA : TEXTYPE_RGBA, TEXF_ALPHA | TEXF_CLAMP | (r_font_compress.integer > 0 ? TEXF_COMPRESS : 0));
 
                if (r_font_diskcache.integer >= 1)
                {
@@ -1635,7 +1635,7 @@ 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 && Draw_IsPicLoaded(map->pic))
+                       if (r_font_compress.integer && 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
                }