SSE patch by kyre, with runtime CPU detection and a cvar r_skeletal_use_sse if SSE...

[xonotic/darkplaces.git] / ft2.c

diff --git a/ft2.c b/ft2.c
index 6b9152c17116b9aa70a32053e35c637e478e383a..1079b5db52eba3d981dc5a3408fcc51e9e7badbc 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -186,8 +186,8 @@ qboolean Font_OpenLibrary (void)
        const char* dllnames [] =
        {
 #if defined(WIN32)
-               "freetype6.dll",
                "libfreetype-6.dll",
+               "freetype6.dll",
 #elif defined(MACOSX)
                "libfreetype.6.dylib",
                "libfreetype.dylib",
@@ -1399,12 +1399,12 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                map->texture = R_LoadTexture2D(font_texturepool, map_identifier,
                                               map->glyphSize * FONT_CHARS_PER_LINE,
                                               map->glyphSize * FONT_CHAR_LINES,
-                                              data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL);
+                                              data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL);
        } else {
                map->texture = R_LoadTexture2D(font_texturepool, map_identifier,
                                               map->glyphSize * FONT_CHARS_PER_LINE,
                                               map->glyphSize * FONT_CHAR_LINES,
-                                              data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL);
+                                              data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL);
        }
 
        Mem_Free(data);