X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_draw.c;h=0ab9c19d7920551f53f81998164008b92526dea3;hp=de361fb0aef825a47574b00427c356dd41a3156b;hb=0e38741a94d0a28e659fb3a87eaa7c9464f5cb8d;hpb=ea7c24e1fb41f3b1df984ac0eed6881c9fde16f5

diff --git a/gl_draw.c b/gl_draw.c
index de361fb0..0ab9c19d 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,41 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
+static qbyte concharimage[11356] =
+{
+#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;
+
+	fs_filesize = 11356;
+	data = LoadTGA (concharimage, 256, 256);
+	fs_filesize = -1;
+
+	for (i = 0;i < 32768;i++)
+	{
+		buffer[i][0] = 255;
+		buffer[i][1] = 255;
+		buffer[i][2] = 255;
+		buffer[i][3] = data[i*4+0];
+	}
+
+	for (i = 32768;i < 65536;i++)
+	{
+		buffer[i][0] = 255;
+		buffer[i][1] = 0;
+		buffer[i][2] = 0;
+		buffer[i][3] = data[i*4+0];
+	}
+	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 +114,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 +231,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
 }
 
 /*
@@ -208,6 +268,14 @@ cachepic_t	*Draw_CachePic (char *path)
 	cachepic_t *pic;
 	qpic_t *p;
 
+	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;
 	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
@@ -223,24 +291,35 @@ cachepic_t	*Draw_CachePic (char *path)
 	cachepichash[hashkey] = pic;
 
 	// load the pic from disk
-	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, false, true);
-	if (pic->tex == NULL && (p = W_GetLumpName (path)))
+	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+	if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
 	{
-		if (!strcmp(path, "conchars"))
+		// compatibility with older versions
+		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+		// failed to find gfx/whatever.tga or similar, try the wad
+		if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
 		{
-			qbyte *pix;
-			// conchars is a raw image and with the wrong transparent color
-			pix = (qbyte *)p;
-			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);
+			if (!strcmp(path, "gfx/conchars"))
+			{
+				qbyte *pix;
+				// conchars is a raw image and with the wrong transparent color
+				pix = (qbyte *)p;
+				for (i = 0;i < 128 * 128;i++)
+					if (pix[i] == 0)
+						pix[i] = 255;
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
+			}
+			else
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
 		}
-		else
-			pic->tex = R_LoadTexture (drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE);
 	}
+
+	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"))
@@ -251,14 +330,80 @@ 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)
-		Sys_Error ("Draw_CachePic: failed to load %s", path);
+	{
+		Con_Printf("Draw_CachePic: failed to load %s\n", path);
+		pic->tex = r_texture_notexture;
+	}
 
 	pic->width = R_TextureWidth(pic->tex);
 	pic->height = R_TextureHeight(pic->tex);
 	return pic;
 }
 
+cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *pixels)
+{
+	int crc, hashkey;
+	cachepic_t *pic;
+
+	crc = CRC_Block(picname, strlen(picname));
+	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
+	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
+		if (!strcmp (picname, pic->name))
+			break;
+
+	if (pic)
+	{
+		if (pic->tex && pic->width == width && pic->height == height)
+		{
+			R_UpdateTexture(pic->tex, pixels);
+			return pic;
+		}
+	}
+	else
+	{
+		if (pic == NULL)
+		{
+			if (numcachepics == MAX_CACHED_PICS)
+				Sys_Error ("numcachepics == MAX_CACHED_PICS");
+			pic = cachepics + (numcachepics++);
+			strcpy (pic->name, picname);
+			// link into list
+			pic->chain = cachepichash[hashkey];
+			cachepichash[hashkey] = pic;
+		}
+	}
+
+	pic->width = width;
+	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);
+	return pic;
+}
+
+void Draw_FreePic(char *picname)
+{
+	int crc;
+	int hashkey;
+	cachepic_t *pic;
+	// this doesn't really free the pic, but does free it's texture
+	crc = CRC_Block(picname, strlen(picname));
+	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
+	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
+	{
+		if (!strcmp (picname, pic->name) && pic->tex)
+		{
+			R_FreeTexture(pic->tex);
+			pic->width = 0;
+			pic->height = 0;
+			return;
+		}
+	}
+}
+
 /*
 ===============
 Draw_Init
@@ -271,7 +416,7 @@ static void gl_draw_start(void)
 	numcachepics = 0;
 	memset(cachepichash, 0, sizeof(cachepichash));
 
-	char_texture = Draw_CachePic("conchars")->tex;
+	char_texture = Draw_CachePic("gfx/conchars")->tex;
 }
 
 static void gl_draw_shutdown(void)
@@ -288,178 +433,110 @@ 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);
 }
 
+float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
+
+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;
-	int batch, batchcount, additive;
+	char *str;
+	int batchcount;
 	unsigned int color;
+	drawqueuemesh_t *mesh;
+	rmeshstate_t m;
 
 	if (!r_render.integer)
 		return;
 
-	qglViewport(vid.realx, vid.realy, vid.realwidth, vid.realheight);
-
-	qglMatrixMode(GL_PROJECTION);
-    qglLoadIdentity();
-	qglOrtho(0, vid.conwidth, vid.conheight, 0, -99999, 99999);
-
-	qglMatrixMode(GL_MODELVIEW);
-    qglLoadIdentity();
+	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;
+		}
+	}
 
-	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);
+	r_view_width = bound(0, r_refdef.width, vid.realwidth);
+	r_view_height = bound(0, r_refdef.height, vid.realheight);
+	r_view_depth = 1;
+	r_view_x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width);
+	r_view_y = bound(0, r_refdef.y, vid.realheight - 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.realheight - (r_view_y + r_view_height), r_view_width, r_view_height);
+	GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
+	qglDepthFunc(GL_LEQUAL);
+	R_Mesh_Matrix(&r_identitymatrix);
 
 	chartexnum = R_GetTexture(char_texture);
 
-	additive = false;
-	qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	currentpic = "";
+	memset(&m, 0, sizeof(m));
+
 	pic = NULL;
-	qglBindTexture(GL_TEXTURE_2D, 0);
+	texnum = 0;
 	color = 0;
-	qglColor4ub(0,0,0,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);
-		if (dq->flags & DRAWFLAG_ADDITIVE)
-		{
-			if (!additive)
-			{
-				if (batch)
-				{
-					batch = false;
-					qglEnd();
-				}
-				additive = true;
-				qglBlendFunc(GL_SRC_ALPHA, GL_ONE);
-			}
-		}
+		color = dq->color;
+
+		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
-		{
-			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();
-		}
+			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 (*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++;
-			}
-			break;
 		case DRAWQUEUE_STRING:
+			GL_Color(c[0], c[1], c[2], c[3]);
 			str = (char *)(dq + 1);
-			if (strcmp("conchars", currentpic))
-			{
-				if (batch)
-				{
-					batch = false;
-					qglEnd();
-				}
-				currentpic = "conchars";
-				qglBindTexture(GL_TEXTURE_2D, chartexnum);
-			}
-			if (!batch)
-			{
-				batch = true;
-				qglBegin(GL_TRIANGLES);
-				batchcount = 0;
-			}
+			batchcount = 0;
+			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)
 			{
 				if (num != ' ')
@@ -468,87 +545,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);
-					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);
+					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 += 12;
 					batchcount++;
+					if (batchcount >= 128)
+					{
+						GL_LockArrays(0, batchcount * 4);
+						R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+						GL_LockArrays(0, 0);
+						batchcount = 0;
+						at = varray_texcoord2f[0];
+						av = varray_vertex3f;
+					}
 				}
 				x += w;
 			}
+			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);
+			if (!m.tex[0])
+				m.pointer_texcoord[0] = NULL;
+			R_Mesh_State(&m);
+			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:
+			{
+				// We have to convert the con coords into real coords
+				int x , y, width, height;
+				x = dq->x * ((float)vid.realwidth / vid.conwidth);
+				// OGL uses top to bottom
+				y = dq->y * ((float) vid.realheight / vid.conheight);
+				width = dq->scalex * ((float)vid.realwidth / vid.conwidth);
+				height = dq->scaley * ((float)vid.realheight / vid.conheight);
+
+				GL_Scissor(x, y, width, height);
+
+				GL_ScissorTest(true);
+			}
+			break;
+		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
 }