X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=d1dbbf4a27b75641411fa97df2d4024e3ee3ff6e;hb=95e0893e5dec7501a4ff07d7522dd4ce24b645aa;hp=90b40c49f844ede2af29efb9f579bcaa778b57ea;hpb=f29b0b98415b3b5df68e374cf6ffe21e4ba571fc;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 90b40c49..d1dbbf4a 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -19,8 +19,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "image.h"
+#include "wad.h"
+
+#include "cl_video.h"
 
-cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
 
 static rtexture_t *char_texture;
 
@@ -35,6 +38,67 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
+static qbyte concharimage[13468] =
+{
+#include "lhfont.h"
+};
+
+extern qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight);
+
+static rtexture_t *draw_generateconchars(void)
+{
+	int i;
+	qbyte buffer[65536][4], *data = NULL;
+	double random;
+
+	fs_filesize = 13396;
+	data = LoadTGA (concharimage, 256, 256);
+	fs_filesize = -1;
+// Gold numbers
+	for (i = 0;i < 8192;i++)
+	{
+		random = lhrandom (0.0,1.0);
+		buffer[i][0] = 83 + (qbyte)(random * 64);
+		buffer[i][1] = 71 + (qbyte)(random * 32);
+		buffer[i][2] = 23 + (qbyte)(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 + (qbyte)(random * 64);
+		buffer[i][1] = 95 + (qbyte)(random * 64);
+		buffer[i][2] = 95 + (qbyte)(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 + (qbyte)(random * 64);
+		buffer[i][1] = 71 + (qbyte)(random * 32);
+		buffer[i][2] = 23 + (qbyte)(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 + (qbyte)(random * 64);
+		buffer[i][1] = 43 + (qbyte)(random * 32);
+		buffer[i][2] = 27 + (qbyte)(random * 32);
+		buffer[i][3] = data[i*4+0];
+	}
+
+#if 0
+	Image_WriteTGARGBA ("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);
+}
+
 static qbyte pointerimage[256] =
 {
 	"333333332......."
@@ -76,7 +140,7 @@ static rtexture_t *draw_generatemousepointer(void)
 			buffer[i][3] = 255;
 		}
 	}
-	return R_LoadTexture(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+	return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
 // must match NUMCROSSHAIRS in r_crosshairs.c
@@ -193,7 +257,29 @@ static rtexture_t *draw_generatecrosshair(int num)
 			data[i][3] = (qbyte) ((int) (in[i] - '0') * 255 / 7);
 		}
 	}
-	return R_LoadTexture(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+	return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
+
+static rtexture_t *draw_generateditherpattern(void)
+{
+#if 1
+	int x, y;
+	qbyte 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
+	qbyte 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
 }
 
 /*
@@ -202,11 +288,20 @@ Draw_CachePic
 ================
 */
 // FIXME: move this to client somehow
-cachepic_t	*Draw_CachePic (char *path)
+cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 {
 	int i, crc, hashkey;
 	cachepic_t *pic;
 	qpic_t *p;
+	int flags;
+
+	if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+		clvideo_t *video;
+
+		video = CL_GetVideo(path);
+		if( video )
+			return &video->cpif;
+	}
 
 	crc = CRC_Block(path, strlen(path));
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
@@ -215,19 +310,29 @@ cachepic_t	*Draw_CachePic (char *path)
 			return pic;
 
 	if (numcachepics == MAX_CACHED_PICS)
-		Sys_Error ("numcachepics == MAX_CACHED_PICS");
+	{
+		Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS");
+		// FIXME: support NULL in callers?
+		return cachepics; // return the first one
+	}
 	pic = cachepics + (numcachepics++);
-	strcpy (pic->name, path);
+	strlcpy (pic->name, path, sizeof(pic->name));
 	// link into list
 	pic->chain = cachepichash[hashkey];
 	cachepichash[hashkey] = pic;
 
+	flags = TEXF_ALPHA;
+	if (persistent)
+		flags |= TEXF_PRECACHE;
+	if (!strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+		flags |= TEXF_CLAMP;
+
 	// load the pic from disk
-	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, false, true);
+	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
 	if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
 	{
 		// compatibility with older versions
-		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, false, true);
+		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, flags);
 		// failed to find gfx/whatever.tga or similar, try the wad
 		if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
 		{
@@ -239,14 +344,19 @@ cachepic_t	*Draw_CachePic (char *path)
 				for (i = 0;i < 128 * 128;i++)
 					if (pix[i] == 0)
 						pix[i] = 255;
-				pic->tex = R_LoadTexture (drawtexturepool, path, 128, 128, pix, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
 			}
 			else
-				pic->tex = R_LoadTexture (drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
 		}
 	}
+
+	if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
+		pic->tex = draw_generateconchars();
 	if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
 		pic->tex = draw_generatemousepointer();
+	if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001.tga"))
+		pic->tex = draw_generatemousepointer();
 	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga"))
 		pic->tex = draw_generatecrosshair(0);
 	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2.tga"))
@@ -257,10 +367,12 @@ cachepic_t	*Draw_CachePic (char *path)
 		pic->tex = draw_generatecrosshair(3);
 	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga"))
 		pic->tex = draw_generatecrosshair(4);
+	if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+		pic->tex = draw_generateditherpattern();
 	if (pic->tex == NULL)
 	{
-		Con_Printf ("Draw_CachePic: failed to load %s\n", path);
-		pic->tex = r_notexture;
+		Con_Printf("Draw_CachePic: failed to load %s\n", path);
+		pic->tex = r_texture_notexture;
 	}
 
 	pic->width = R_TextureWidth(pic->tex);
@@ -268,7 +380,7 @@ cachepic_t	*Draw_CachePic (char *path)
 	return pic;
 }
 
-cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *pixels)
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, qbyte *pixels)
 {
 	int crc, hashkey;
 	cachepic_t *pic;
@@ -292,7 +404,11 @@ cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *
 		if (pic == NULL)
 		{
 			if (numcachepics == MAX_CACHED_PICS)
-				Sys_Error ("numcachepics == MAX_CACHED_PICS");
+			{
+				Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS");
+				// FIXME: support NULL in callers?
+				return cachepics; // return the first one
+			}
 			pic = cachepics + (numcachepics++);
 			strcpy (pic->name, picname);
 			// link into list
@@ -305,11 +421,11 @@ cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *
 	pic->height = height;
 	if (pic->tex)
 		R_FreeTexture(pic->tex);
-	pic->tex = R_LoadTexture (drawtexturepool, picname, width, height, pixels, TEXTYPE_RGBA, alpha ? TEXF_ALPHA : 0);
+	pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels, TEXTYPE_RGBA, alpha ? TEXF_ALPHA : 0, NULL);
 	return pic;
 }
 
-void Draw_FreePic(char *picname)
+void Draw_FreePic(const char *picname)
 {
 	int crc;
 	int hashkey;
@@ -319,7 +435,7 @@ void Draw_FreePic(char *picname)
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
 	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
 	{
-		if (!strcmp (picname, pic->name))
+		if (!strcmp (picname, pic->name) && pic->tex)
 		{
 			R_FreeTexture(pic->tex);
 			pic->width = 0;
@@ -341,7 +457,7 @@ static void gl_draw_start(void)
 	numcachepics = 0;
 	memset(cachepichash, 0, sizeof(cachepichash));
 
-	char_texture = Draw_CachePic("gfx/conchars")->tex;
+	char_texture = Draw_CachePic("gfx/conchars", true)->tex;
 }
 
 static void gl_draw_shutdown(void)
@@ -358,124 +474,111 @@ static void gl_draw_newmap(void)
 
 void GL_Draw_Init (void)
 {
-	Cvar_RegisterVariable (&scr_conalpha);
-
 	numcachepics = 0;
 	memset(cachepichash, 0, sizeof(cachepichash));
 
 	R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
 }
 
-extern cvar_t gl_mesh_drawrangeelements;
-extern int gl_maxdrawrangeelementsvertices;
-extern int gl_maxdrawrangeelementsindices;
+float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
 
-#if 0
+int quadelements[768];
 void R_DrawQueue(void)
 {
-	int pos, num, chartexnum, overbright;
-	float x, y, w, h, s, t, u, v;
+	int pos, num, chartexnum, texnum, batch;
+	float x, y, w, h, s, t, u, v, *av, *at, c[4];
 	cachepic_t *pic;
 	drawqueue_t *dq;
-	char *str, *currentpic;
+	char *str;
 	int batchcount;
 	unsigned int color;
 	drawqueuemesh_t *mesh;
+	rmeshstate_t m;
 
 	if (!r_render.integer)
 		return;
 
-	GL_SetupView_ViewPort(vid.realx, vid.realy, vid.realwidth, vid.realheight);
-	GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
-	GL_SetupView_Orientation_Identity();
-	GL_DepthFunc(GL_LEQUAL);
-	R_Mesh_Start();
+	if (!quadelements[1])
+	{
+		// elements for rendering a series of quads as triangles
+		for (batch = 0, pos = 0, num = 0;batch < 128;batch++, num += 4)
+		{
+			quadelements[pos++] = num;
+			quadelements[pos++] = num + 1;
+			quadelements[pos++] = num + 2;
+			quadelements[pos++] = num;
+			quadelements[pos++] = num + 2;
+			quadelements[pos++] = num + 3;
+		}
+	}
+
+	r_view_width = bound(0, r_refdef.width, vid.width);
+	r_view_height = bound(0, r_refdef.height, vid.height);
+	r_view_depth = 1;
+	r_view_x = bound(0, r_refdef.x, vid.width - r_refdef.width);
+	r_view_y = bound(0, r_refdef.y, vid.height - r_refdef.height);
+	r_view_z = 0;
+	r_view_fov_x = bound(0.1, r_refdef.fov_x, 170);
+	r_view_fov_y = bound(0.1, r_refdef.fov_y, 170);
+	r_view_matrix = r_refdef.viewentitymatrix;
+	GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
+
+	qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
+	GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+	qglDepthFunc(GL_LEQUAL);
+	R_Mesh_Matrix(&r_identitymatrix);
 
 	chartexnum = R_GetTexture(char_texture);
 
-	currentpic = "";
+	memset(&m, 0, sizeof(m));
+
 	pic = NULL;
 	texnum = 0;
 	color = 0;
+	GL_Color(1,1,1,1);
 
-	overbright = v_overbrightbits.integer;
 	batch = false;
 	batchcount = 0;
 	for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size)
 	{
 		dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
-		additive = (dq->flags & DRAWFLAG_ADDITIVE) != 0;
 		color = dq->color;
-		m.blendfunc1 = GL_SRC_ALPHA;
-		if (additive)
-			m.blendfunc2 = GL_ONE;
+
+		if(dq->flags == DRAWFLAG_ADDITIVE)
+			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+		else if(dq->flags == DRAWFLAG_MODULATE)
+			GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+		else if(dq->flags == DRAWFLAG_2XMODULATE)
+			GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
 		else
-			m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-		m.depthdisable = true;
-		R_Mesh_MainState(&m);
-
-		cr = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
-		cg = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
-		cb = (float) ((color >>  8) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
-		ca = (float) ( color        & 0xFF) * (1.0f / 255.0f);
+			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+		GL_DepthMask(true);
+		GL_DepthTest(false);
+
+		c[0] = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f);
+		c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f);
+		c[2] = (float) ((color >>  8) & 0xFF) * (1.0f / 255.0f);
+		c[3] = (float) ( color        & 0xFF) * (1.0f / 255.0f);
 		x = dq->x;
 		y = dq->y;
 		w = dq->scalex;
 		h = dq->scaley;
-		
+
 		switch(dq->command)
 		{
-		case DRAWQUEUE_PIC:
-			str = (char *)(dq + 1);
-			if (strcmp(str, currentpic))
-			{
-				if (batch)
-				{
-					batch = false;
-					qglEnd();
-				}
-				currentpic = str;
-				pic = Draw_CachePic(str);
-				qglBindTexture(GL_TEXTURE_2D, R_GetTexture(pic->tex));
-			}
-			if (*str)
-			{
-				if (w == 0)
-					w = pic->width;
-				if (h == 0)
-					h = pic->height;
-			}
-			varray_color[0] = varray_color[4] = varray_color[ 8] = varray_color[12] = cr;
-			varray_color[1] = varray_color[5] = varray_color[ 9] = varray_color[13] = cg;
-			varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = cb;
-			varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = ca;
-			varray_texcoord[0] = 0;varray_texcoord[1] = 0;
-			varray_texcoord[2] = 1;varray_texcoord[3] = 0;
-			varray_texcoord[4] = 1;varray_texcoord[5] = 1;
-			varray_texcoord[6] = 0;varray_texcoord[7] = 1;
-			varray_vertex[ 0] = x  ;varray_vertex[ 1] = y  ;varray_vertex[ 2] = 0;
-			varray_vertex[ 4] = x+w;varray_vertex[ 5] = y  ;varray_vertex[ 6] = 0;
-			varray_vertex[ 8] = x+w;varray_vertex[ 9] = y+h;varray_vertex[10] = 0;
-			varray_vertex[12] = x  ;varray_vertex[13] = y+h;varray_vertex[14] = 0;
-			R_Mesh_Draw(4, 2, polygonelements);
-			break;
 		case DRAWQUEUE_STRING:
+			GL_Color(c[0], c[1], c[2], c[3]);
 			str = (char *)(dq + 1);
-			if (strcmp("gfx/conchars", currentpic))
-			{
-				if (batch)
-				{
-					batch = false;
-					qglEnd();
-				}
-				currentpic = "gfx/conchars";
-				qglBindTexture(GL_TEXTURE_2D, chartexnum);
-			}
 			batchcount = 0;
-			ac = varray_color;
-			at = varray_texcoord;
-			av = varray_vertex;
-			while ((num = *str++) && x < vid.conwidth)
+			m.pointer_vertex = varray_vertex3f;
+			m.pointer_color = NULL;
+			m.pointer_texcoord[0] = varray_texcoord2f[0];
+			m.tex[0] = chartexnum;
+			R_Mesh_State(&m);
+			at = varray_texcoord2f[0];
+			av = varray_vertex3f;
+			while ((num = *str++) && x < vid_conwidth.integer)
 			{
 				if (num != ' ')
 				{
@@ -483,396 +586,110 @@ void R_DrawQueue(void)
 					t = (num >> 4)*0.0625f + (0.5f / 256.0f);
 					u = 0.0625f - (1.0f / 256.0f);
 					v = 0.0625f - (1.0f / 256.0f);
-					ac[0] = ac[4] = ac[ 8] = ac[12] = cr;
-					ac[1] = ac[5] = ac[ 9] = ac[13] = cg;
-					ac[2] = ac[6] = ac[10] = ac[14] = cb;
-					ac[3] = ac[7] = ac[11] = ac[15] = ca;
-					at[0] = s  ;at[1] = t  ;
-					at[2] = s+u;at[3] = t  ;
-					at[4] = s+u;at[5] = t+v;
-					at[6] = s  ;at[7] = t+v;
-					av[0] = x  ;av[1] = y  ;av[2] = 0;
-					av[4] = x+w;av[1] = y  ;av[2] = 0;
-					av[8] = x+w;av[1] = y+h;av[2] = 0;
-					av[0] = x  ;av[1] = y+h;av[2] = 0;
-					ac += 16;
+					at[ 0] = s  ;at[ 1] = t  ;
+					at[ 2] = s+u;at[ 3] = t  ;
+					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[ 9] = x  ;av[10] = y+h;av[11] = 10;
 					at += 8;
-					av += 16;
+					av += 12;
 					batchcount++;
 					if (batchcount >= 128)
 					{
-						R_Mesh_Draw(batchcount * 4, batchcount * 2, polygonelements);
+						GL_LockArrays(0, batchcount * 4);
+						R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+						GL_LockArrays(0, 0);
 						batchcount = 0;
-						ac = varray_color;
-						at = varray_texcoord;
-						av = varray_vertex;
+						at = varray_texcoord2f[0];
+						av = varray_vertex3f;
 					}
 				}
 				x += w;
 			}
-			R_Mesh_Draw(batchcount * 4, batchcount * 2, polygonelements);
+			if (batchcount > 0)
+			{
+				GL_LockArrays(0, batchcount * 4);
+				R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+				GL_LockArrays(0, 0);
+			}
 			break;
 		case DRAWQUEUE_MESH:
 			mesh = (void *)(dq + 1);
+			m.pointer_vertex = mesh->data_vertex3f;
+			m.pointer_color = mesh->data_color4f;
+			m.pointer_texcoord[0] = mesh->data_texcoord2f;
 			m.tex[0] = R_GetTexture(mesh->texture);
-			R_Mesh_ResizeCheck(mesh->numvertices);
-			memcpy(varray_vertex, mesh->vertices, sizeof(float[4]) * mesh->numvertices);
-			memcpy(varray_texcoord, mesh->texcoords, sizeof(float[2]) * mesh->numvertices);
-			memcpy(varray_color, mesh->colors, sizeof(float[4]) * mesh->numvertices);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->indices);
-			currentpic = "\0";
-			break;
-		}
-	}
-
-	if (!v_hwgamma.integer)
-	{
-		t = v_contrast.value * (float) (1 << v_overbrightbits.integer);
-		if (t >= 1.01f)
-		{
-			m.blendfunc1 = GL_DST_COLOR;
-			m.blendfunc2 = GL_ONE;
-			m.depthdisable = true;
+			if (!m.tex[0])
+				m.pointer_texcoord[0] = NULL;
 			R_Mesh_State(&m);
-			while (t >= 1.01f)
+			GL_LockArrays(0, mesh->num_vertices);
+			R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+			GL_LockArrays(0, 0);
+			break;
+		case DRAWQUEUE_SETCLIP:
 			{
-				cr = t - 1.0f;
-				if (cr > 1.0f)
-					cr = 1.0f;
-				varray_color[0] = varray_color[4] = varray_color[ 8] = varray_color[12] = cr;
-				varray_color[1] = varray_color[5] = varray_color[ 9] = varray_color[13] = cr;
-				varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = cr;
-				varray_texcoord[0] = 0;varray_texcoord[1] = 0;
-				varray_texcoord[2] = 0;varray_texcoord[3] = 0;
-				varray_texcoord[4] = 0;varray_texcoord[5] = 0;
-				varray_vertex[0] = -5000;varray_vertex[1] = -5000;varray_vertex[2] = 0;
-				varray_vertex[4] = 10000;varray_vertex[1] = -5000;varray_vertex[2] = 0;
-				varray_vertex[8] = -5000;varray_vertex[1] = 10000;varray_vertex[2] = 0;
-				R_Mesh_Draw(3, 1, polygonelements);
-				t *= 0.5;
-			}
-		}
-		else if (t <= 0.99f)
-		{
-			qglBlendFunc(GL_ZERO, GL_SRC_COLOR);
-			CHECKGLERROR
-			qglBegin(GL_TRIANGLES);
-			num = (int) (t * 255.0f);
-			qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
-			qglVertex2f (-5000, -5000);
-			qglVertex2f (10000, -5000);
-			qglVertex2f (-5000, 10000);
-			qglEnd();
-			CHECKGLERROR
-		}
-		if (v_brightness.value >= 0.01f)
-		{
-			qglBlendFunc (GL_ONE, GL_ONE);
-			CHECKGLERROR
-			num = (int) (v_brightness.value * 255.0f);
-			qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
-			CHECKGLERROR
-			qglBegin (GL_TRIANGLES);
-			qglVertex2f (-5000, -5000);
-			qglVertex2f (10000, -5000);
-			qglVertex2f (-5000, 10000);
-			qglEnd ();
-			CHECKGLERROR
-		}
-		qglEnable(GL_TEXTURE_2D);
-		CHECKGLERROR
-	}
+				// We have to convert the con coords into real coords
+				int x , y, width, height;
+				x = dq->x * ((float)vid.width / vid_conwidth.integer);
+				// OGL uses top to bottom
+				y = dq->y * ((float) vid.height / vid_conheight.integer);
+				width = dq->scalex * ((float)vid.width / vid_conwidth.integer);
+				height = dq->scaley * ((float)vid.height / vid_conheight.integer);
 
-	qglBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	CHECKGLERROR
-	qglEnable (GL_CULL_FACE);
-	CHECKGLERROR
-	qglEnable (GL_DEPTH_TEST);
-	CHECKGLERROR
-	qglDisable (GL_BLEND);
-	CHECKGLERROR
-	qglColor4ub (255, 255, 255, 255);
-	CHECKGLERROR
-}
-#else
-void R_DrawQueue(void)
-{
-	int pos, num, chartexnum, overbright;
-	float x, y, w, h, s, t, u, v;
-	cachepic_t *pic;
-	drawqueue_t *dq;
-	char *str, *currentpic;
-	int batch, batchcount, additive;
-	unsigned int color;
-	drawqueuemesh_t *mesh;
-
-	if (!r_render.integer)
-		return;
-
-	qglMatrixMode(GL_PROJECTION);
-	qglLoadIdentity();
-	qglOrtho(0, vid.conwidth, vid.conheight, 0, -99999, 99999);
-
-	qglMatrixMode(GL_MODELVIEW);
-    qglLoadIdentity();
-	
-	qglDisable(GL_DEPTH_TEST);
-	qglDisable(GL_CULL_FACE);
-	qglEnable(GL_BLEND);
-	qglEnable(GL_TEXTURE_2D);
-	qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-	chartexnum = R_GetTexture(char_texture);
-
-	additive = false;
-	qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	currentpic = "";
-	pic = NULL;
-	qglBindTexture(GL_TEXTURE_2D, 0);
-	color = 0;
-	qglColor4ub(0,0,0,0);
+				GL_Scissor(x, y, width, height);
 
-	overbright = v_overbrightbits.integer;
-	batch = false;
-	batchcount = 0;
-	for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size)
-	{
-		dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
-		if (dq->flags & DRAWFLAG_ADDITIVE)
-		{
-			if (!additive)
-			{
-				if (batch)
-				{
-					batch = false;
-					qglEnd();
-				}
-				additive = true;
-				qglBlendFunc(GL_SRC_ALPHA, GL_ONE);
-			}
-		}
-		else
-		{
-			if (additive)
-			{
-				if (batch)
-				{
-					batch = false;
-					qglEnd();
-				}
-				additive = false;
-				qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			}
-		}
-		if (color != dq->color)
-		{
-			color = dq->color;
-			qglColor4ub((qbyte)(((color >> 24) & 0xFF) >> overbright), (qbyte)(((color >> 16) & 0xFF) >> overbright), (qbyte)(((color >> 8) & 0xFF) >> overbright), (qbyte)(color & 0xFF));
-		}
-		if (batch && batchcount > 128)
-		{
-			batch = false;
-			qglEnd();
-		}
-		x = dq->x;
-		y = dq->y;
-		w = dq->scalex;
-		h = dq->scaley;
-		switch(dq->command)
-		{
-		case DRAWQUEUE_PIC:
-			str = (char *)(dq + 1);
-			if (*str)
-			{
-				if (strcmp(str, currentpic))
-				{
-					if (batch)
-					{
-						batch = false;
-						qglEnd();
-					}
-					currentpic = str;
-					pic = Draw_CachePic(str);
-					qglBindTexture(GL_TEXTURE_2D, R_GetTexture(pic->tex));
-				}
-				if (w == 0)
-					w = pic->width;
-				if (h == 0)
-					h = pic->height;
-				if (!batch)
-				{
-					batch = true;
-					qglBegin(GL_TRIANGLES);
-					batchcount = 0;
-				}
-				qglTexCoord2f (0, 0);qglVertex2f (x  , y  );
-				qglTexCoord2f (1, 0);qglVertex2f (x+w, y  );
-				qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
-				qglTexCoord2f (0, 0);qglVertex2f (x  , y  );
-				qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
-				qglTexCoord2f (0, 1);qglVertex2f (x  , y+h);
-				batchcount++;
-			}
-			else
-			{
-				if (currentpic[0])
-				{
-					if (batch)
-					{
-						batch = false;
-						qglEnd();
-					}
-					currentpic = "";
-					qglBindTexture(GL_TEXTURE_2D, 0);
-				}
-				if (!batch)
-				{
-					batch = true;
-					qglBegin(GL_TRIANGLES);
-					batchcount = 0;
-				}
-				qglTexCoord2f (0, 0);qglVertex2f (x  , y  );
-				qglTexCoord2f (1, 0);qglVertex2f (x+w, y  );
-				qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
-				qglTexCoord2f (0, 0);qglVertex2f (x  , y  );
-				qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
-				qglTexCoord2f (0, 1);qglVertex2f (x  , y+h);
-				batchcount++;
+				GL_ScissorTest(true);
 			}
 			break;
-		case DRAWQUEUE_STRING:
-			str = (char *)(dq + 1);
-			if (strcmp("gfx/conchars", currentpic))
-			{
-				if (batch)
-				{
-					batch = false;
-					qglEnd();
-				}
-				currentpic = "gfx/conchars";
-				qglBindTexture(GL_TEXTURE_2D, chartexnum);
-			}
-			if (!batch)
-			{
-				batch = true;
-				qglBegin(GL_TRIANGLES);
-				batchcount = 0;
-			}
-			while ((num = *str++) && x < vid.conwidth)
-			{
-				if (num != ' ')
-				{
-					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);
-					qglTexCoord2f (s  , t  );qglVertex2f (x  , y  );
-					qglTexCoord2f (s+u, t  );qglVertex2f (x+w, y  );
-					qglTexCoord2f (s+u, t+v);qglVertex2f (x+w, y+h);
-					qglTexCoord2f (s  , t  );qglVertex2f (x  , y  );
-					qglTexCoord2f (s+u, t+v);qglVertex2f (x+w, y+h);
-					qglTexCoord2f (s  , t+v);qglVertex2f (x  , y+h);
-					batchcount++;
-				}
-				x += w;
-			}
-			break;
-		case DRAWQUEUE_MESH:
-			if (batch)
-			{
-				batch = false;
-				qglEnd();
-			}
-			
-			mesh = (void *)(dq + 1);
-			qglBindTexture(GL_TEXTURE_2D, R_GetTexture(mesh->texture));
-			qglVertexPointer(3, GL_FLOAT, sizeof(float[4]), mesh->vertices);CHECKGLERROR
-			qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), mesh->texcoords);CHECKGLERROR
-			qglColorPointer(4, GL_FLOAT, sizeof(float[4]), mesh->colors);CHECKGLERROR
-			qglEnableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
-			qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
-			qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR
-			GL_DrawRangeElements(0, mesh->numvertices, mesh->numindices, mesh->indices);
-			qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
-			qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
-			qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
-
-			// restore color, since it got trashed by using color array
-			qglColor4ub((qbyte)(((color >> 24) & 0xFF) >> overbright), (qbyte)(((color >> 16) & 0xFF) >> overbright), (qbyte)(((color >> 8) & 0xFF) >> overbright), (qbyte)(color & 0xFF));
-			CHECKGLERROR
-			currentpic = "\0";
+		case DRAWQUEUE_RESETCLIP:
+			GL_ScissorTest(false);
 			break;
 		}
 	}
-	if (batch)
-		qglEnd();
-	CHECKGLERROR
 
-	if (!v_hwgamma.integer)
+	if (!vid_usinghwgamma)
 	{
-		qglDisable(GL_TEXTURE_2D);
-		CHECKGLERROR
-		t = v_contrast.value * (float) (1 << v_overbrightbits.integer);
-		if (t >= 1.01f)
+		// all the blends ignore depth
+		memset(&m, 0, sizeof(m));
+		m.pointer_vertex = blendvertex3f;
+		R_Mesh_State(&m);
+		GL_DepthMask(true);
+		GL_DepthTest(false);
+		if (v_color_enable.integer)
+		{
+			c[0] = v_color_white_r.value;
+			c[1] = v_color_white_g.value;
+			c[2] = v_color_white_b.value;
+		}
+		else
+			c[0] = c[1] = c[2] = v_contrast.value;
+		if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
 		{
-			qglBlendFunc (GL_DST_COLOR, GL_ONE);
-			CHECKGLERROR
-			qglBegin (GL_TRIANGLES);
-			while (t >= 1.01f)
+			GL_BlendFunc(GL_DST_COLOR, GL_ONE);
+			while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
 			{
-				num = (int) ((t - 1.0f) * 255.0f);
-				if (num > 255)
-					num = 255;
-				qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
-				qglVertex2f (-5000, -5000);
-				qglVertex2f (10000, -5000);
-				qglVertex2f (-5000, 10000);
-				t *= 0.5;
+				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);
+				VectorScale(c, 0.5, c);
 			}
-			qglEnd ();
-			CHECKGLERROR
 		}
-		else if (t <= 0.99f)
+		if (v_color_enable.integer)
 		{
-			qglBlendFunc(GL_ZERO, GL_SRC_COLOR);
-			CHECKGLERROR
-			qglBegin(GL_TRIANGLES);
-			num = (int) (t * 255.0f);
-			qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
-			qglVertex2f (-5000, -5000);
-			qglVertex2f (10000, -5000);
-			qglVertex2f (-5000, 10000);
-			qglEnd();
-			CHECKGLERROR
+			c[0] = v_color_black_r.value;
+			c[1] = v_color_black_g.value;
+			c[2] = v_color_black_b.value;
 		}
-		if (v_brightness.value >= 0.01f)
+		else
+			c[0] = c[1] = c[2] = v_brightness.value;
+		if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f)
 		{
-			qglBlendFunc (GL_ONE, GL_ONE);
-			CHECKGLERROR
-			num = (int) (v_brightness.value * 255.0f);
-			qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
-			CHECKGLERROR
-			qglBegin (GL_TRIANGLES);
-			qglVertex2f (-5000, -5000);
-			qglVertex2f (10000, -5000);
-			qglVertex2f (-5000, 10000);
-			qglEnd ();
-			CHECKGLERROR
+			GL_BlendFunc(GL_ONE, GL_ONE);
+			GL_Color(c[0], c[1], c[2], 1);
+			R_Mesh_Draw(0, 3, 1, polygonelements);
 		}
-		qglEnable(GL_TEXTURE_2D);
-		CHECKGLERROR
 	}
-
-	qglBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	CHECKGLERROR
-	qglEnable (GL_CULL_FACE);
-	CHECKGLERROR
-	qglEnable (GL_DEPTH_TEST);
-	CHECKGLERROR
-	qglDisable (GL_BLEND);
-	CHECKGLERROR
-	qglColor4ub (255, 255, 255, 255);
-	CHECKGLERROR
 }
-#endif