X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=ft2.c;h=484a3159779ffe54c10eca6aa5204e25cebbd16a;hb=cf74e01c006d2937bf1e3a522efc7b2dd0f40ba2;hp=859c92ba3507d9c3a08718b4d5aca1fe8683c060;hpb=e1566b77c280f0fb9c0961c11db24c4d9ddfd3c3;p=xonotic%2Fdarkplaces.git

diff --git a/ft2.c b/ft2.c
index 859c92ba..484a3159 100644
--- a/ft2.c
+++ b/ft2.c
@@ -39,6 +39,7 @@ cvar_t r_font_size_snapping = {CVAR_SAVE, "r_font_size_snapping", "1", "stick to
 cvar_t r_font_kerning = {CVAR_SAVE, "r_font_kerning", "1", "Use kerning if available"};
 cvar_t r_font_diskcache = {CVAR_SAVE, "r_font_diskcache", "0", "save font textures to disk for future loading rather than generating them every time"};
 cvar_t r_font_compress = {CVAR_SAVE, "r_font_compress", "0", "use texture compression on font textures to save video memory"};
+cvar_t r_font_nonpoweroftwo = {CVAR_SAVE, "r_font_nonpoweroftwo", "1", "use nonpoweroftwo textures for font (saves memory, potentially slower)"};
 cvar_t developer_font = {CVAR_SAVE, "developer_font", "0", "prints debug messages about fonts"};
 
 /*
@@ -334,6 +335,7 @@ void font_newmap(void)
 
 void Font_Init(void)
 {
+	Cvar_RegisterVariable(&r_font_nonpoweroftwo);
 	Cvar_RegisterVariable(&r_font_disable_freetype);
 	Cvar_RegisterVariable(&r_font_use_alpha_textures);
 	Cvar_RegisterVariable(&r_font_size_snapping);
@@ -828,7 +830,9 @@ static qboolean Font_LoadSize(ft2_font_t *font, float size, qboolean check_only)
 
 	memset(&temp, 0, sizeof(temp));
 	temp.size = size;
-	temp.glyphSize = CeilPowerOf2(size*2 + max(gpad_l + gpad_r, gpad_t + gpad_b));
+	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))
+		temp.glyphSize = CeilPowerOf2(temp.glyphSize);
 	temp.sfx = (1.0/64.0)/(double)size;
 	temp.sfy = (1.0/64.0)/(double)size;
 	temp.intSize = -1; // negative value: LoadMap must search now :)
@@ -1211,19 +1215,26 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
 
 	// create a totally unique name for this map, then we will use it to make a unique cachepic_t to avoid redundant textures
 	dpsnprintf(map_identifier, sizeof(map_identifier),
-		"%s_cache_%g_%u_%g_%g_%g_%g_%g_%u",
+		"%s_cache_%g_%d_%g_%g_%g_%g_%g_%u",
 		font->name,
-		mapstart->intSize,
-		load_flags,
-		font->settings->blur,
-		font->settings->outline,
-		font->settings->shadowx,
-		font->settings->shadowy,
-		font->settings->shadowz,
-		(unsigned)map->start/FONT_CHARS_PER_MAP);
+		(double) mapstart->intSize,
+		(int) load_flags,
+		(double) font->settings->blur,
+		(double) font->settings->outline,
+		(double) font->settings->shadowx,
+		(double) font->settings->shadowy,
+		(double) font->settings->shadowz,
+		(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);
+	}
 
 	Font_Postprocess(font, NULL, 0, bytesPerPixel, mapstart->size*2, mapstart->size*2, &gpad_l, &gpad_r, &gpad_t, &gpad_b);