X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=9d3d47b531deb7b14b87d4b978717657f6f6223f;hb=5090f6da276d673f6ee0b149ee2f83ef82f62902;hp=b6d8d065000ea5ebab0d7b3317daf9c3e676b228;hpb=8e986191acf8ad593f6ecf5a5adcd0934534264f;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index b6d8d065..9d3d47b5 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -23,12 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "wad.h"
 
 #include "cl_video.h"
+#include "cl_dyntexture.h"
+
+dp_font_t dp_fonts[MAX_FONTS] = {{0}};
 
 cvar_t r_textshadow = {CVAR_SAVE, "r_textshadow", "0", "draws a shadow on all text to improve readability (note: value controls offset, 1 = 1 pixel, 1.5 = 1.5 pixels, etc)"};
 cvar_t r_textbrightness = {CVAR_SAVE, "r_textbrightness", "0", "additional brightness for text color codes (0 keeps colors as is, 1 makes them all white)"};
+cvar_t r_textcontrast = {CVAR_SAVE, "r_textcontrast", "1", "additional contrast for text color codes (1 keeps colors as is, 0 makes them all black)"};
 
-static rtexture_t *char_texture;
-cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
+extern cvar_t v_glslgamma;
 
 //=============================================================================
 /* Support Routines */
@@ -42,7 +45,7 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
-static unsigned char concharimage[FONT_FILESIZE] =
+static const unsigned char concharimage[FONT_FILESIZE] =
 {
 #include "lhfont.h"
 };
@@ -53,97 +56,113 @@ static rtexture_t *draw_generateconchars(void)
 	unsigned char buffer[65536][4], *data = NULL;
 	double random;
 
-	data = LoadTGA (concharimage, FONT_FILESIZE, 256, 256);
+	data = LoadTGA_BGRA (concharimage, FONT_FILESIZE);
 // Gold numbers
 	for (i = 0;i < 8192;i++)
 	{
 		random = lhrandom (0.0,1.0);
-		buffer[i][0] = 83 + (unsigned char)(random * 64);
+		buffer[i][2] = 83 + (unsigned char)(random * 64);
 		buffer[i][1] = 71 + (unsigned char)(random * 32);
-		buffer[i][2] = 23 + (unsigned char)(random * 16);
+		buffer[i][0] = 23 + (unsigned char)(random * 16);
 		buffer[i][3] = data[i*4+0];
 	}
 // White chars
 	for (i = 8192;i < 32768;i++)
 	{
 		random = lhrandom (0.0,1.0);
-		buffer[i][0] = 95 + (unsigned char)(random * 64);
-		buffer[i][1] = 95 + (unsigned char)(random * 64);
 		buffer[i][2] = 95 + (unsigned char)(random * 64);
+		buffer[i][1] = 95 + (unsigned char)(random * 64);
+		buffer[i][0] = 95 + (unsigned char)(random * 64);
 		buffer[i][3] = data[i*4+0];
 	}
 // Gold numbers
 	for (i = 32768;i < 40960;i++)
 	{
 		random = lhrandom (0.0,1.0);
-		buffer[i][0] = 83 + (unsigned char)(random * 64);
+		buffer[i][2] = 83 + (unsigned char)(random * 64);
 		buffer[i][1] = 71 + (unsigned char)(random * 32);
-		buffer[i][2] = 23 + (unsigned char)(random * 16);
+		buffer[i][0] = 23 + (unsigned char)(random * 16);
 		buffer[i][3] = data[i*4+0];
 	}
 // Red chars
 	for (i = 40960;i < 65536;i++)
 	{
 		random = lhrandom (0.0,1.0);
-		buffer[i][0] = 96 + (unsigned char)(random * 64);
+		buffer[i][2] = 96 + (unsigned char)(random * 64);
 		buffer[i][1] = 43 + (unsigned char)(random * 32);
-		buffer[i][2] = 27 + (unsigned char)(random * 32);
+		buffer[i][0] = 27 + (unsigned char)(random * 32);
 		buffer[i][3] = data[i*4+0];
 	}
 
 #if 0
-	Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
+	Image_WriteTGABGRA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
 #endif
 
 	Mem_Free(data);
-	return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+	return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
+
+static rtexture_t *draw_generateditherpattern(void)
+{
+	int x, y;
+	unsigned char pixels[8][8];
+	for (y = 0;y < 8;y++)
+		for (x = 0;x < 8;x++)
+			pixels[y][x] = ((x^y) & 4) ? 254 : 0;
+	return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, pixels[0], TEXTYPE_PALETTE, TEXF_FORCENEAREST | TEXF_PRECACHE, palette_bgra_transparent);
 }
 
-static char *pointerimage =
-	"333333332......."
-	"26777761........"
-	"2655541........."
-	"265541.........."
-	"2654561........."
-	"26414561........"
-	"251.14561......."
-	"21...14561......"
-	"1.....141......."
-	".......1........"
+typedef struct embeddedpic_s
+{
+	const char *name;
+	int width;
+	int height;
+	const char *pixels;
+}
+embeddedpic_t;
+
+static const embeddedpic_t embeddedpics[] =
+{
+	{
+	"gfx/prydoncursor001", 16, 16,
+	"477777774......."
+	"77.....6........"
+	"7.....6........."
+	"7....6.........."
+	"7.....6........."
+	"7..6...6........"
+	"7.6.6...6......."
+	"76...6...6......"
+	"4.....6.6......."
+	".......6........"
 	"................"
 	"................"
 	"................"
 	"................"
 	"................"
 	"................"
-;
-
-static rtexture_t *draw_generatemousepointer(void)
-{
-	int i;
-	unsigned char buffer[256][4];
-	for (i = 0;i < 256;i++)
+	},
 	{
-		if (pointerimage[i] == '.')
-		{
-			buffer[i][0] = 0;
-			buffer[i][1] = 0;
-			buffer[i][2] = 0;
-			buffer[i][3] = 0;
-		}
-		else
-		{
-			buffer[i][0] = (pointerimage[i] - '0') * 16;
-			buffer[i][1] = (pointerimage[i] - '0') * 16;
-			buffer[i][2] = (pointerimage[i] - '0') * 16;
-			buffer[i][3] = 255;
-		}
-	}
-	return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
-}
-
-static char *crosshairtexdata[NUMCROSSHAIRS] =
-{
+	"ui/mousepointer", 16, 16,
+	"477777774......."
+	"77.....6........"
+	"7.....6........."
+	"7....6.........."
+	"7.....6........."
+	"7..6...6........"
+	"7.6.6...6......."
+	"76...6...6......"
+	"4.....6.6......."
+	".......6........"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	},
+	{
+	"gfx/crosshair1", 16, 16,
 	"................"
 	"................"
 	"................"
@@ -160,7 +179,9 @@ static char *crosshairtexdata[NUMCROSSHAIRS] =
 	"................"
 	"................"
 	"................"
-	,
+	},
+	{
+	"gfx/crosshair2", 16, 16,
 	"................"
 	"................"
 	"................"
@@ -177,7 +198,9 @@ static char *crosshairtexdata[NUMCROSSHAIRS] =
 	"................"
 	"................"
 	"................"
-	,
+	},
+	{
+	"gfx/crosshair3", 16, 16,
 	"................"
 	".......77......."
 	".......77......."
@@ -194,7 +217,9 @@ static char *crosshairtexdata[NUMCROSSHAIRS] =
 	".......77......."
 	".......77......."
 	"................"
-	,
+	},
+	{
+	"gfx/crosshair4", 16, 16,
 	"................"
 	"................"
 	"................"
@@ -211,87 +236,174 @@ static char *crosshairtexdata[NUMCROSSHAIRS] =
 	"........7......."
 	"........7......."
 	"................"
-	,
-	"................"
+	},
+	{
+	"gfx/crosshair5", 8, 8,
+	"........"
+	"........"
+	"....7..."
+	"........"
+	"..7.7.7."
+	"........"
+	"....7..."
+	"........"
+	},
+	{
+	"gfx/crosshair6", 2, 2,
+	"77"
+	"77"
+	},
+	{
+	"gfx/crosshair7", 16, 16,
 	"................"
+	".3............3."
+	"..5...2332...5.."
+	"...7.3....3.7..."
+	"....7......7...."
+	"...3.7....7.3..."
+	"..2...7..7...2.."
+	"..3..........3.."
+	"..3..........3.."
+	"..2...7..7...2.."
+	"...3.7....7.3..."
+	"....7......7...."
+	"...7.3....3.7..."
+	"..5...2332...5.."
+	".3............3."
 	"................"
+	},
+	{
+	"gfx/editlights/cursor", 16, 16,
 	"................"
+	".3............3."
+	"..5...2332...5.."
+	"...7.3....3.7..."
+	"....7......7...."
+	"...3.7....7.3..."
+	"..2...7..7...2.."
+	"..3..........3.."
+	"..3..........3.."
+	"..2...7..7...2.."
+	"...3.7....7.3..."
+	"....7......7...."
+	"...7.3....3.7..."
+	"..5...2332...5.."
+	".3............3."
 	"................"
-	"........7......."
+	},
+	{
+	"gfx/editlights/light", 16, 16,
 	"................"
-	"........4......."
-	".....7.4.4.7...."
-	"........4......."
 	"................"
-	"........7......."
+	"......1111......"
+	"....11233211...."
+	"...1234554321..."
+	"...1356776531..."
+	"..124677776421.."
+	"..135777777531.."
+	"..135777777531.."
+	"..124677776421.."
+	"...1356776531..."
+	"...1234554321..."
+	"....11233211...."
+	"......1111......"
 	"................"
 	"................"
+	},
+	{
+	"gfx/editlights/noshadow", 16, 16,
 	"................"
 	"................"
-	,
+	"......1111......"
+	"....11233211...."
+	"...1234554321..."
+	"...1356226531..."
+	"..12462..26421.."
+	"..1352....2531.."
+	"..1352....2531.."
+	"..12462..26421.."
+	"...1356226531..."
+	"...1234554321..."
+	"....11233211...."
+	"......1111......"
 	"................"
 	"................"
+	},
+	{
+	"gfx/editlights/selection", 16, 16,
 	"................"
+	".777752..257777."
+	".742........247."
+	".72..........27."
+	".7............7."
+	".5............5."
+	".2............2."
 	"................"
 	"................"
+	".2............2."
+	".5............5."
+	".7............7."
+	".72..........27."
+	".742........247."
+	".777752..257777."
 	"................"
+	},
+	{
+	"gfx/editlights/cubemaplight", 16, 16,
 	"................"
-	".......55......."
-	".......55......."
 	"................"
+	"......2772......"
+	"....27755772...."
+	"..277533335772.."
+	"..753333333357.."
+	"..777533335777.."
+	"..735775577537.."
+	"..733357753337.."
+	"..733337733337.."
+	"..753337733357.."
+	"..277537735772.."
+	"....27777772...."
+	"......2772......"
 	"................"
 	"................"
+	},
+	{
+	"gfx/editlights/cubemapnoshadowlight", 16, 16,
 	"................"
 	"................"
+	"......2772......"
+	"....27722772...."
+	"..2772....2772.."
+	"..72........27.."
+	"..7772....2777.."
+	"..7.27722772.7.."
+	"..7...2772...7.."
+	"..7....77....7.."
+	"..72...77...27.."
+	"..2772.77.2772.."
+	"....27777772...."
+	"......2772......"
 	"................"
 	"................"
+	},
+	{NULL, 0, 0, NULL}
 };
 
-static rtexture_t *draw_generatecrosshair(int num)
+static rtexture_t *draw_generatepic(const char *name, qboolean quiet)
 {
-	int i;
-	char *in;
-	unsigned char data[16*16][4];
-	in = crosshairtexdata[num];
-	for (i = 0;i < 16*16;i++)
-	{
-		if (in[i] == '.')
-		{
-			data[i][0] = 255;
-			data[i][1] = 255;
-			data[i][2] = 255;
-			data[i][3] = 0;
-		}
-		else
-		{
-			data[i][0] = data[i][1] = data[i][2] = (unsigned char) ((int) (in[i] - '0') * 127 / 7 + 128);
-			data[i][3] = 255;
-		}
-	}
-	return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num+1), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+	const embeddedpic_t *p;
+	for (p = embeddedpics;p->name;p++)
+		if (!strcmp(name, p->name))
+			return R_LoadTexture2D(drawtexturepool, p->name, p->width, p->height, (const unsigned char *)p->pixels, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_bgra_embeddedpic);
+	if (!strcmp(name, "gfx/conchars"))
+		return draw_generateconchars();
+	if (!strcmp(name, "gfx/colorcontrol/ditherpattern"))
+		return draw_generateditherpattern();
+	if (!quiet)
+		Con_Printf("Draw_CachePic: failed to load %s\n", name);
+	return r_texture_notexture;
 }
 
-static rtexture_t *draw_generateditherpattern(void)
-{
-#if 1
-	int x, y;
-	unsigned char data[8*8*4];
-	for (y = 0;y < 8;y++)
-	{
-		for (x = 0;x < 8;x++)
-		{
-			data[(y*8+x)*4+0] = data[(y*8+x)*4+1] = data[(y*8+x)*4+2] = ((x^y) & 4) ? 255 : 0;
-			data[(y*8+x)*4+3] = 255;
-		}
-	}
-	return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
-#else
-	unsigned char data[16];
-	memset(data, 255, sizeof(data));
-	data[0] = data[1] = data[2] = data[12] = data[13] = data[14] = 0;
-	return R_LoadTexture2D(drawtexturepool, "ditherpattern", 2, 2, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
-#endif
-}
 
 /*
 ================
@@ -299,7 +411,7 @@ Draw_CachePic
 ================
 */
 // FIXME: move this to client somehow
-cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
+cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 {
 	int crc, hashkey;
 	cachepic_t *pic;
@@ -308,15 +420,7 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 	unsigned char *lmpdata;
 	char lmpname[MAX_QPATH];
 
-	if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
-	{
-		clvideo_t *video;
-
-		video = CL_GetVideoByName(path);
-		if( video )
-			return &video->cpif;
-	}
-
+	// check whether the picture has already been cached
 	crc = CRC_Block((unsigned char *)path, strlen(path));
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
 	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
@@ -335,18 +439,30 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 	pic->chain = cachepichash[hashkey];
 	cachepichash[hashkey] = pic;
 
+	// check whether it is an dynamic texture (if so, we can directly use its texture handler)
+	pic->tex = CL_GetDynTexture( path );
+	// if so, set the width/height, too
+	if( pic->tex ) {
+		pic->width = R_TextureWidth(pic->tex);
+		pic->height = R_TextureHeight(pic->tex);
+		// we're done now (early-out)
+		return pic;
+	}
+
 	flags = TEXF_ALPHA;
-	if (persistent)
+	if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
 		flags |= TEXF_PRECACHE;
-	if (!strcmp(path, "gfx/colorcontrol/ditherpattern"))
+	if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
 		flags |= TEXF_CLAMP;
+	if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
+		flags |= TEXF_COMPRESS;
 
 	// load a high quality image from disk if possible
-	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags | (gl_texturecompression_2d.integer ? TEXF_COMPRESS : 0));
+	pic->tex = loadtextureimage(drawtexturepool, path, false, flags, true);
 	if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
 	{
 		// compatibility with older versions which did not require gfx/ prefix
-		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, flags | (gl_texturecompression_2d.integer ? TEXF_COMPRESS : 0));
+		pic->tex = loadtextureimage(drawtexturepool, path + 4, false, flags, true);
 	}
 	// if a high quality image was loaded, set the pic's size to match it, just
 	// in case there's no low quality version to get the size from
@@ -363,18 +479,24 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 	dpsnprintf(lmpname, sizeof(lmpname), "%s.lmp", path);
 	if (!strncmp(path, "gfx/", 4) && (lmpdata = FS_LoadFile(lmpname, tempmempool, false, &lmpsize)))
 	{
+		if (developer_loading.integer)
+			Con_Printf("loading lump \"%s\"\n", path);
+
 		if (lmpsize >= 9)
 		{
 			pic->width = lmpdata[0] + lmpdata[1] * 256 + lmpdata[2] * 65536 + lmpdata[3] * 16777216;
 			pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
 			// if no high quality replacement image was found, upload the original low quality texture
 			if (!pic->tex)
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags, palette_transparent);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags & ~TEXF_COMPRESS, palette_bgra_transparent);
 		}
 		Mem_Free(lmpdata);
 	}
 	else if ((lmpdata = W_GetLumpName (path + 4)))
 	{
+		if (developer_loading.integer)
+			Con_Printf("loading gfx.wad lump \"%s\"\n", path + 4);
+
 		if (!strcmp(path, "gfx/conchars"))
 		{
 			// conchars is a raw image and with color 0 as transparent instead of 255
@@ -382,7 +504,7 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 			pic->height = 128;
 			// if no high quality replacement image was found, upload the original low quality texture
 			if (!pic->tex)
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, flags, palette_font);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, flags & ~TEXF_COMPRESS, palette_bgra_font);
 		}
 		else
 		{
@@ -390,40 +512,14 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 			pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
 			// if no high quality replacement image was found, upload the original low quality texture
 			if (!pic->tex)
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags, palette_transparent);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags & ~TEXF_COMPRESS, palette_bgra_transparent);
 		}
 	}
 
-	// if it's not found on disk, check if it's one of the builtin images
+	// if it's not found on disk, generate an image
 	if (pic->tex == NULL)
 	{
-		if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
-			pic->tex = draw_generateconchars();
-		if (pic->tex == NULL && !strcmp(path, "ui/mousepointer"))
-			pic->tex = draw_generatemousepointer();
-		if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001"))
-			pic->tex = draw_generatemousepointer();
-		if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1"))
-			pic->tex = draw_generatecrosshair(0);
-		if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2"))
-			pic->tex = draw_generatecrosshair(1);
-		if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3"))
-			pic->tex = draw_generatecrosshair(2);
-		if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4"))
-			pic->tex = draw_generatecrosshair(3);
-		if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5"))
-			pic->tex = draw_generatecrosshair(4);
-		if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6"))
-			pic->tex = draw_generatecrosshair(5);
-		if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern"))
-			pic->tex = draw_generateditherpattern();
-		if (pic->tex == NULL)
-		{
-			// don't complain about missing gfx/crosshair images
-			if (strncmp(path, "gfx/crosshair", 13))
-				Con_Printf("Draw_CachePic: failed to load %s\n", path);
-			pic->tex = r_texture_notexture;
-		}
+		pic->tex = draw_generatepic(path, (cachepicflags & CACHEPICFLAG_QUIET) != 0);
 		pic->width = R_TextureWidth(pic->tex);
 		pic->height = R_TextureHeight(pic->tex);
 	}
@@ -431,7 +527,12 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 	return pic;
 }
 
-cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels)
+cachepic_t *Draw_CachePic (const char *path)
+{
+	return Draw_CachePic_Flags (path, 0);
+}
+
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels_bgra)
 {
 	int crc, hashkey;
 	cachepic_t *pic;
@@ -446,7 +547,7 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, u
 	{
 		if (pic->tex && pic->width == width && pic->height == height)
 		{
-			R_UpdateTexture(pic->tex, pixels, 0, 0, width, height);
+			R_UpdateTexture(pic->tex, pixels_bgra, 0, 0, width, height);
 			return pic;
 		}
 	}
@@ -472,7 +573,7 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, u
 	pic->height = height;
 	if (pic->tex)
 		R_FreeTexture(pic->tex);
-	pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels, TEXTYPE_RGBA, alpha ? TEXF_ALPHA : 0, NULL);
+	pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels_bgra, TEXTYPE_BGRA, alpha ? TEXF_ALPHA : 0, NULL);
 	return pic;
 }
 
@@ -496,6 +597,132 @@ void Draw_FreePic(const char *picname)
 	}
 }
 
+extern int con_linewidth; // to force rewrapping
+static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
+{
+	int i;
+	float maxwidth, scale;
+	char widthfile[MAX_QPATH];
+	char *widthbuf;
+	fs_offset_t widthbufsize;
+
+	if(override || !fnt->texpath[0])
+		strlcpy(fnt->texpath, name, sizeof(fnt->texpath));
+
+	if(drawtexturepool == NULL)
+		return; // before gl_draw_start, so will be loaded later
+
+	fnt->tex = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION)->tex;
+	if(fnt->tex == r_texture_notexture)
+	{
+		fnt->tex = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION)->tex;
+		strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
+	}
+	else
+		dpsnprintf(widthfile, sizeof(widthfile), "%s.width", fnt->texpath);
+
+	// unspecified width == 1 (base width)
+	for(i = 1; i < 256; ++i)
+		fnt->width_of[i] = 1;
+	scale = 1;
+
+	// FIXME load "name.width", if it fails, fill all with 1
+	if((widthbuf = (char *) FS_LoadFile(widthfile, tempmempool, true, &widthbufsize)))
+	{
+		float extraspacing = 0;
+		const char *p = widthbuf;
+		int ch = 0;
+
+		while(ch < 256)
+		{
+			if(!COM_ParseToken_Simple(&p, false, false))
+				return;
+
+			switch(*com_token)
+			{
+				case '0':
+				case '1':
+				case '2':
+				case '3':
+				case '4':
+				case '5':
+				case '6':
+				case '7':
+				case '8':
+				case '9':
+				case '+':
+				case '-':
+				case '.':
+					fnt->width_of[ch++] = atof(com_token) + extraspacing;
+					break;
+				default:
+					if(!strcmp(com_token, "extraspacing"))
+					{
+						if(!COM_ParseToken_Simple(&p, false, false))
+							return;
+						extraspacing = atof(com_token);
+					}
+					else if(!strcmp(com_token, "scale"))
+					{
+						if(!COM_ParseToken_Simple(&p, false, false))
+							return;
+						scale = atof(com_token);
+					}
+					else
+					{
+						Con_Printf("Warning: skipped unknown font property %s\n", com_token);
+						if(!COM_ParseToken_Simple(&p, false, false))
+							return;
+					}
+					break;
+			}
+		}
+
+		Mem_Free(widthbuf);
+	}
+
+	maxwidth = fnt->width_of[1];
+	for(i = 2; i < 256; ++i)
+		maxwidth = max(maxwidth, fnt->width_of[i]);
+	fnt->maxwidth = maxwidth;
+
+	// fix up maxwidth for overlap
+	fnt->maxwidth *= scale;
+	fnt->scale = scale;
+
+	if(fnt == FONT_CONSOLE)
+		con_linewidth = -1; // rewrap console in next frame
+}
+
+static dp_font_t *FindFont(const char *title)
+{
+	int i;
+	for(i = 0; i < MAX_FONTS; ++i)
+		if(!strcmp(dp_fonts[i].title, title))
+			return &dp_fonts[i];
+	return NULL;
+}
+
+static void LoadFont_f(void)
+{
+	dp_font_t *f;
+	int i;
+	if(Cmd_Argc() < 2)
+	{
+		Con_Printf("Available font commands:\n");
+		for(i = 0; i < MAX_FONTS; ++i)
+			Con_Printf("  loadfont %s gfx/tgafile\n", dp_fonts[i].title);
+		return;
+	}
+	f = FindFont(Cmd_Argv(1));
+	if(f == NULL)
+	{
+		Con_Printf("font function not found\n");
+		return;
+	}
+	LoadFont(true, (Cmd_Argc() < 3) ? "gfx/conchars" : Cmd_Argv(2), f);
+}
+
 /*
 ===============
 Draw_Init
@@ -509,9 +736,8 @@ static void gl_draw_start(void)
 	numcachepics = 0;
 	memset(cachepichash, 0, sizeof(cachepichash));
 
-	char_texture = Draw_CachePic("gfx/conchars", true)->tex;
-	for (i = 1;i <= NUMCROSSHAIRS;i++)
-		r_crosshairs[i] = Draw_CachePic(va("gfx/crosshair%i", i), true);
+	for(i = 0; i < MAX_FONTS; ++i)
+		LoadFont(false, va("gfx/font_%s", dp_fonts[i].title), &dp_fonts[i]);
 
 	// draw the loading screen so people have something to see in the newly opened window
 	SCR_UpdateLoadingScreen(true);
@@ -531,19 +757,35 @@ static void gl_draw_newmap(void)
 
 void GL_Draw_Init (void)
 {
+	int i, j;
 	Cvar_RegisterVariable(&r_textshadow);
 	Cvar_RegisterVariable(&r_textbrightness);
+	Cvar_RegisterVariable(&r_textcontrast);
+	Cmd_AddCommand ("loadfont",LoadFont_f, "loadfont function tganame loads a font; example: loadfont console gfx/veramono; loadfont without arguments lists the available functions");
 	R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
+
+	strlcpy(FONT_DEFAULT->title, "default", sizeof(FONT_DEFAULT->title));
+		strlcpy(FONT_DEFAULT->texpath, "gfx/conchars", sizeof(FONT_DEFAULT->texpath));
+	strlcpy(FONT_CONSOLE->title, "console", sizeof(FONT_CONSOLE->title));
+	strlcpy(FONT_SBAR->title, "sbar", sizeof(FONT_SBAR->title));
+	strlcpy(FONT_NOTIFY->title, "notify", sizeof(FONT_NOTIFY->title));
+	strlcpy(FONT_CHAT->title, "chat", sizeof(FONT_CHAT->title));
+	strlcpy(FONT_CENTERPRINT->title, "centerprint", sizeof(FONT_CENTERPRINT->title));
+	strlcpy(FONT_INFOBAR->title, "infobar", sizeof(FONT_INFOBAR->title));
+	strlcpy(FONT_MENU->title, "menu", sizeof(FONT_MENU->title));
+	for(i = 0, j = 0; i < MAX_USERFONTS; ++i)
+		if(!FONT_USER[i].title[0])
+			dpsnprintf(FONT_USER[i].title, sizeof(FONT_USER[i].title), "user%d", j++);
 }
 
-static void _DrawQ_Setup(void)
+void _DrawQ_Setup(void)
 {
 	if (r_refdef.draw2dstage)
 		return;
 	r_refdef.draw2dstage = true;
 	CHECKGLERROR
-	qglViewport(r_view.x, vid.height - (r_view.y + r_view.height), r_view.width, r_view.height);CHECKGLERROR
-	GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1);
+	qglViewport(r_refdef.view.x, vid.height - (r_refdef.view.y + r_refdef.view.height), r_refdef.view.width, r_refdef.view.height);CHECKGLERROR
+	GL_ColorMask(r_refdef.view.colormask[0], r_refdef.view.colormask[1], r_refdef.view.colormask[2], 1);
 	GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
 	qglDepthFunc(GL_LEQUAL);CHECKGLERROR
 	qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR
@@ -558,10 +800,7 @@ static void _DrawQ_Setup(void)
 	GL_AlphaTest(false);
 	GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-	if (gl_support_fragment_shader)
-	{
-		qglUseProgramObjectARB(0);CHECKGLERROR
-	}
+	R_SetupGenericShader(true);
 }
 
 static void _DrawQ_ProcessDrawFlag(int flags)
@@ -574,6 +813,8 @@ static void _DrawQ_ProcessDrawFlag(int flags)
 		GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
 	else if(flags == DRAWFLAG_2XMODULATE)
 		GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+	else if(flags == DRAWFLAG_SCREEN)
+		GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
 	else
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
@@ -588,6 +829,7 @@ void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, flo
 	R_Mesh_VertexPointer(floats, 0, 0);
 	R_Mesh_ColorPointer(NULL, 0, 0);
 	R_Mesh_ResetTextureState();
+	R_SetupGenericShader(pic != NULL);
 	if (pic)
 	{
 		if (width == 0)
@@ -597,16 +839,23 @@ void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, flo
 		R_Mesh_TexBind(0, R_GetTexture(pic->tex));
 		R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
 
+#if 1
+		floats[12] = 0.0f;floats[13] = 0.0f;
+		floats[14] = 1.0f;floats[15] = 0.0f;
+		floats[16] = 1.0f;floats[17] = 1.0f;
+		floats[18] = 0.0f;floats[19] = 1.0f;
+#else
       // AK07: lets be texel correct on the corners
       {
-         float horz_offset = 0.5f / width;
-         float vert_offset = 0.5f / height;
+         float horz_offset = 0.5f / pic->width;
+         float vert_offset = 0.5f / pic->height;
 
 		   floats[12] = 0.0f + horz_offset;floats[13] = 0.0f + vert_offset;
 		   floats[14] = 1.0f - horz_offset;floats[15] = 0.0f + vert_offset;
 		   floats[16] = 1.0f - horz_offset;floats[17] = 1.0f - vert_offset;
 		   floats[18] = 0.0f + horz_offset;floats[19] = 1.0f - vert_offset;
       }
+#endif
 	}
 
 	floats[2] = floats[5] = floats[8] = floats[11] = 0;
@@ -615,7 +864,7 @@ void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, flo
 	floats[3] = floats[6] = x + width;
 	floats[7] = floats[10] = y + height;
 
-	R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
 void DrawQ_Fill(float x, float y, float width, float height, float red, float green, float blue, float alpha, int flags)
@@ -628,6 +877,7 @@ void DrawQ_Fill(float x, float y, float width, float height, float red, float gr
 	R_Mesh_VertexPointer(floats, 0, 0);
 	R_Mesh_ColorPointer(NULL, 0, 0);
 	R_Mesh_ResetTextureState();
+	R_SetupGenericShader(false);
 
 	floats[2] = floats[5] = floats[8] = floats[11] = 0;
 	floats[0] = floats[9] = x;
@@ -635,11 +885,11 @@ void DrawQ_Fill(float x, float y, float width, float height, float red, float gr
 	floats[3] = floats[6] = x + width;
 	floats[7] = floats[10] = y + height;
 
-	R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
 // color tag printing
-static vec4_t string_colors[] =
+static const vec4_t string_colors[] =
 {
 	// Quake3 colors
 	// LordHavoc: why on earth is cyan before magenta in Quake3?
@@ -670,9 +920,10 @@ static vec4_t string_colors[] =
 
 static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g, float b, float a, qboolean shadow)
 {
-	float v = r_textbrightness.value;
+	float C = r_textcontrast.value;
+	float B = r_textbrightness.value;
 	Vector4Copy(string_colors[colorindex], color);
-	Vector4Set(color, (color[0] * (1-v) + v) * r, (color[1] * (1-v) + v) * g, (color[2] * (1-v) + v) * b, color[3] * a);
+	Vector4Set(color, (color[0] * C + B) * r, (color[1] * C + B) * g, (color[2] * C + B) * b, color[3] * a);
 	if (shadow)
 	{
 		float shadowalpha = color[0]+color[1]+color[2] * 0.8;
@@ -680,10 +931,63 @@ static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g,
 	}
 }
 
-float DrawQ_String(float startx, float starty, const char *text, int maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes)
+float DrawQ_TextWidth_Font_UntilWidth_TrackColors(const char *text, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
 {
-	int i, num, shadow, colorindex = STRING_COLOR_DEFAULT;
-	float x = startx, y, s, t, u, v;
+	int num, colorindex = STRING_COLOR_DEFAULT;
+	size_t i;
+	float x = 0;
+
+	if (*maxlen < 1)
+		*maxlen = 1<<30;
+
+	if (!outcolor || *outcolor == -1)
+		colorindex = STRING_COLOR_DEFAULT;
+	else
+		colorindex = *outcolor;
+
+	maxwidth /= fnt->scale;
+
+	for (i = 0;i < *maxlen && text[i];i++)
+	{
+		if (text[i] == ' ')
+		{
+			if(x + fnt->width_of[' '] > maxwidth)
+				break; // oops, can't draw this
+			x += fnt->width_of[' '];
+			continue;
+		}
+		if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < *maxlen)
+		{
+			if (text[i+1] == STRING_COLOR_TAG)
+			{
+				i++;
+			}
+			else if (text[i+1] >= '0' && text[i+1] <= '9')
+			{
+				colorindex = text[i+1] - '0';
+				i++;
+				continue;
+			}
+		}
+		num = (unsigned char) text[i];
+		if(x + fnt->width_of[num] > maxwidth)
+			break; // oops, can't draw this
+		x += fnt->width_of[num];
+	}
+
+	*maxlen = i;
+
+	if (outcolor)
+		*outcolor = colorindex;
+
+	return x * fnt->scale;
+}
+
+float DrawQ_String_Font(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
+{
+	int num, shadow, colorindex = STRING_COLOR_DEFAULT;
+	size_t i;
+	float x = startx, y, s, t, u, v, thisw;
 	float *av, *at, *ac;
 	float color[4];
 	int batchcount;
@@ -691,6 +995,14 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
 	float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
 	float color4f[QUADELEMENTS_MAXQUADS*4*4];
 
+	int tw, th;
+	tw = R_TextureWidth(fnt->tex);
+	th = R_TextureHeight(fnt->tex);
+
+	starty -= (fnt->scale - 1) * h * 0.5; // center
+	w *= fnt->scale;
+	h *= fnt->scale;
+
 	if (maxlen < 1)
 		maxlen = 1<<30;
 
@@ -698,16 +1010,17 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
 
 	R_Mesh_ColorPointer(color4f, 0, 0);
 	R_Mesh_ResetTextureState();
-	R_Mesh_TexBind(0, R_GetTexture(char_texture));
+	R_Mesh_TexBind(0, R_GetTexture(fnt->tex));
 	R_Mesh_TexCoordPointer(0, 2, texcoord2f, 0, 0);
 	R_Mesh_VertexPointer(vertex3f, 0, 0);
+	R_SetupGenericShader(true);
 
 	ac = color4f;
 	at = texcoord2f;
 	av = vertex3f;
 	batchcount = 0;
 
-	for (shadow = r_textshadow.value != 0;shadow >= 0;shadow--)
+	for (shadow = r_textshadow.value != 0 && basealpha > 0;shadow >= 0;shadow--)
 	{
 		if (!outcolor || *outcolor == -1)
 			colorindex = STRING_COLOR_DEFAULT;
@@ -722,32 +1035,34 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
 			x += r_textshadow.value;
 			y += r_textshadow.value;
 		}
-		for (i = 0;i < maxlen && text[i];i++, x += w)
+		for (i = 0;i < maxlen && text[i];i++)
 		{
 			if (text[i] == ' ')
+			{
+				x += fnt->width_of[' '] * w;
 				continue;
+			}
 			if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < maxlen)
 			{
 				if (text[i+1] == STRING_COLOR_TAG)
 				{
 					i++;
-					if (text[i] == ' ')
-						continue;
 				}
 				else if (text[i+1] >= '0' && text[i+1] <= '9')
 				{
 					colorindex = text[i+1] - '0';
 					DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
 					i++;
-					x -= w;
 					continue;
 				}
 			}
-			num = text[i];
-			s = (num & 15)*0.0625f + (0.5f / 256.0f);
-			t = (num >> 4)*0.0625f + (0.5f / 256.0f);
-			u = 0.0625f - (1.0f / 256.0f);
-			v = 0.0625f - (1.0f / 256.0f);
+			num = (unsigned char) text[i];
+			thisw = fnt->width_of[num];
+			// FIXME make these smaller to just include the occupied part of the character for slightly faster rendering
+			s = (num & 15)*0.0625f + (0.5f / tw);
+			t = (num >> 4)*0.0625f + (0.5f / th);
+			u = 0.0625f * thisw - (1.0f / tw);
+			v = 0.0625f - (1.0f / th);
 			ac[ 0] = color[0];ac[ 1] = color[1];ac[ 2] = color[2];ac[ 3] = color[3];
 			ac[ 4] = color[0];ac[ 5] = color[1];ac[ 6] = color[2];ac[ 7] = color[3];
 			ac[ 8] = color[0];ac[ 9] = color[1];ac[10] = color[2];ac[11] = color[3];
@@ -757,8 +1072,8 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
 			at[ 4] = s+u;at[ 5] = t+v;
 			at[ 6] = s  ;at[ 7] = t+v;
 			av[ 0] = x  ;av[ 1] = y  ;av[ 2] = 10;
-			av[ 3] = x+w;av[ 4] = y  ;av[ 5] = 10;
-			av[ 6] = x+w;av[ 7] = y+h;av[ 8] = 10;
+			av[ 3] = x+w*thisw;av[ 4] = y  ;av[ 5] = 10;
+			av[ 6] = x+w*thisw;av[ 7] = y+h;av[ 8] = 10;
 			av[ 9] = x  ;av[10] = y+h;av[11] = 10;
 			ac += 16;
 			at += 8;
@@ -766,27 +1081,22 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
 			batchcount++;
 			if (batchcount >= QUADELEMENTS_MAXQUADS)
 			{
-				if (basealpha >= (1.0f / 255.0f))
-				{
-					GL_LockArrays(0, batchcount * 4);
-					R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
-					GL_LockArrays(0, 0);
-				}
+				GL_LockArrays(0, batchcount * 4);
+				R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, NULL, quadelements, 0, 0);
+				GL_LockArrays(0, 0);
 				batchcount = 0;
 				ac = color4f;
 				at = texcoord2f;
 				av = vertex3f;
 			}
+			x += thisw * w;
 		}
 	}
 	if (batchcount > 0)
 	{
-		if (basealpha >= (1.0f / 255.0f))
-		{
-			GL_LockArrays(0, batchcount * 4);
-			R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
-			GL_LockArrays(0, 0);
-		}
+		GL_LockArrays(0, batchcount * 4);
+		R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, NULL, quadelements, 0, 0);
+		GL_LockArrays(0, 0);
 	}
 
 	if (outcolor)
@@ -796,6 +1106,21 @@ float DrawQ_String(float startx, float starty, const char *text, int maxlen, flo
 	return x;
 }
 
+float DrawQ_String(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes)
+{
+	return DrawQ_String_Font(startx, starty, text, maxlen, w, h, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, &dp_fonts[0]);
+}
+
+float DrawQ_TextWidth_Font_UntilWidth(const char *text, size_t *maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+{
+	return DrawQ_TextWidth_Font_UntilWidth_TrackColors(text, maxlen, NULL, ignorecolorcodes, fnt, maxWidth);
+}
+
+float DrawQ_TextWidth_Font(const char *text, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
+{
+	return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, ignorecolorcodes, fnt, 1000000000);
+}
+
 #if 0
 // not used
 static int DrawQ_BuildColoredText(char *output2c, size_t maxoutchars, const char *text, int maxreadchars, qboolean ignorecolorcodes, int *outcolor)
@@ -844,6 +1169,7 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
 	R_Mesh_VertexPointer(floats, 0, 0);
 	R_Mesh_ColorPointer(floats + 20, 0, 0);
 	R_Mesh_ResetTextureState();
+	R_SetupGenericShader(pic != NULL);
 	if (pic)
 	{
 		if (width == 0)
@@ -852,17 +1178,10 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
 			height = pic->height;
 		R_Mesh_TexBind(0, R_GetTexture(pic->tex));
 		R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
-
-      // AK07: lets be texel correct on the corners
-      {
-         float horz_offset = 0.5f / width;
-         float vert_offset = 0.5f / height;
-
-         floats[12] = s1 + horz_offset;floats[13] = t1 + vert_offset;
-         floats[14] = s2 - horz_offset;floats[15] = t2 + vert_offset;
-         floats[16] = s4 - horz_offset;floats[17] = t4 - vert_offset;
-         floats[18] = s3 + horz_offset;floats[19] = t3 - vert_offset;
-      }
+		floats[12] = s1;floats[13] = t1;
+		floats[14] = s2;floats[15] = t2;
+		floats[16] = s4;floats[17] = t4;
+		floats[18] = s3;floats[19] = t3;
 	}
 
 	floats[2] = floats[5] = floats[8] = floats[11] = 0;
@@ -875,7 +1194,7 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
 	floats[28] = r4;floats[29] = g4;floats[30] = b4;floats[31] = a4;
 	floats[32] = r3;floats[33] = g3;floats[34] = b3;floats[35] = a3;
 
-	R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
 void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
@@ -887,9 +1206,10 @@ void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
 	R_Mesh_ResetTextureState();
 	R_Mesh_TexBind(0, R_GetTexture(mesh->texture));
 	R_Mesh_TexCoordPointer(0, 2, mesh->data_texcoord2f, 0, 0);
+	R_SetupGenericShader(mesh->texture != NULL);
 
 	GL_LockArrays(0, mesh->num_vertices);
-	R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i, 0, 0);
+	R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, NULL, mesh->data_element3s, 0, 0);
 	GL_LockArrays(0, 0);
 }
 
@@ -917,6 +1237,8 @@ void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, f
 {
 	_DrawQ_ProcessDrawFlag(flags);
 
+	R_SetupGenericShader(false);
+
 	CHECKGLERROR
 	qglLineWidth(width);CHECKGLERROR
 
@@ -955,12 +1277,13 @@ static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 1000
 void R_DrawGamma(void)
 {
 	float c[4];
-	if (!vid_usinghwgamma)
+	if (!vid_usinghwgamma && !(r_glsl.integer && v_glslgamma.integer))
 	{
 		// all the blends ignore depth
 		R_Mesh_VertexPointer(blendvertex3f, 0, 0);
 		R_Mesh_ColorPointer(NULL, 0, 0);
 		R_Mesh_ResetTextureState();
+		R_SetupGenericShader(false);
 		GL_DepthMask(true);
 		GL_DepthRange(0, 1);
 		GL_PolygonOffset(0, 0);
@@ -979,7 +1302,7 @@ void R_DrawGamma(void)
 			while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
 			{
 				GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1);
-				R_Mesh_Draw(0, 3, 1, polygonelements, 0, 0);
+				R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
 				VectorScale(c, 0.5, c);
 			}
 		}
@@ -995,7 +1318,7 @@ void R_DrawGamma(void)
 		{
 			GL_BlendFunc(GL_ONE, GL_ONE);
 			GL_Color(c[0], c[1], c[2], 1);
-			R_Mesh_Draw(0, 3, 1, polygonelements, 0, 0);
+			R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
 		}
 	}
 }