]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_draw.c
fixed repeated gamma ramp setting attempts in case of failure (again)
[xonotic/darkplaces.git] / gl_draw.c
index 388ba9e8d5465683ca289452be75fd5b2001c086..2db1c747565f6dc22392ee12845f8ea5874e2fff 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -18,719 +18,921 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-// draw.c -- this is the only file outside the refresh that touches the
-// vid buffer
-
 #include "quakedef.h"
+#include "image.h"
+#include "wad.h"
 
-#define GL_COLOR_INDEX8_EXT     0x80E5
-
-extern unsigned char d_15to8table[65536];
+#include "cl_video.h"
 
-cvar_t         qsg_version = {"qsg_version", "1"};
-cvar_t         scr_conalpha = {"scr_conalpha", "1"};
+cvar_t r_textshadow = {0, "r_textshadow", "0", "draws a shadow on all text to improve readability"};
 
-byte           *draw_chars;                            // 8*8 graphic characters
-qpic_t         *draw_disc;
+static rtexture_t *char_texture;
+cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
 
-//int                  translate_texture;
-int                    char_texture;
-
-typedef struct
-{
-       int             texnum;
-       float   sl, tl, sh, th;
-} glpic_t;
+//=============================================================================
+/* Support Routines */
 
-byte           conback_buffer[sizeof(qpic_t) + sizeof(glpic_t)];
-qpic_t         *conback = (qpic_t *)&conback_buffer;
+#define FONT_FILESIZE 13468
+#define MAX_CACHED_PICS 1024
+#define CACHEPICHASHSIZE 256
+static cachepic_t *cachepichash[CACHEPICHASHSIZE];
+static cachepic_t cachepics[MAX_CACHED_PICS];
+static int numcachepics;
 
-/*
-=============================================================================
+static rtexturepool_t *drawtexturepool;
 
-  scrap allocation
+static unsigned char concharimage[FONT_FILESIZE] =
+{
+#include "lhfont.h"
+};
 
-  Allocate all the little status bar obejcts into a single texture
-  to crutch up stupid hardware / drivers
+static rtexture_t *draw_generateconchars(void)
+{
+       int i;
+       unsigned char buffer[65536][4], *data = NULL;
+       double random;
 
-=============================================================================
-*/
+       data = LoadTGA (concharimage, FONT_FILESIZE, 256, 256);
+// Gold numbers
+       for (i = 0;i < 8192;i++)
+       {
+               random = lhrandom (0.0,1.0);
+               buffer[i][0] = 83 + (unsigned char)(random * 64);
+               buffer[i][1] = 71 + (unsigned char)(random * 32);
+               buffer[i][2] = 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][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][1] = 71 + (unsigned char)(random * 32);
+               buffer[i][2] = 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][1] = 43 + (unsigned char)(random * 32);
+               buffer[i][2] = 27 + (unsigned char)(random * 32);
+               buffer[i][3] = data[i*4+0];
+       }
 
-#define        MAX_SCRAPS              2
-#define        BLOCK_WIDTH             256
-#define        BLOCK_HEIGHT    256
+#if 0
+       Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
+#endif
 
-int                    scrap_allocated[MAX_SCRAPS][BLOCK_WIDTH];
-byte           scrap_texels[MAX_SCRAPS][BLOCK_WIDTH*BLOCK_HEIGHT*4];
-qboolean       scrap_dirty;
+       Mem_Free(data);
+       return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
 
-// returns a texture number and the position inside it
-int Scrap_AllocBlock (int w, int h, int *x, int *y)
+static char *pointerimage =
+       "333333332......."
+       "26777761........"
+       "2655541........."
+       "265541.........."
+       "2654561........."
+       "26414561........"
+       "251.14561......."
+       "21...14561......"
+       "1.....141......."
+       ".......1........"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+;
+
+static rtexture_t *draw_generatemousepointer(void)
 {
-       int             i, j;
-       int             best, best2;
-       int             texnum;
-
-       for (texnum=0 ; texnum<MAX_SCRAPS ; texnum++)
+       int i;
+       unsigned char buffer[256][4];
+       for (i = 0;i < 256;i++)
        {
-               best = BLOCK_HEIGHT;
-
-               for (i=0 ; i<BLOCK_WIDTH-w ; i++)
+               if (pointerimage[i] == '.')
                {
-                       best2 = 0;
-
-                       for (j=0 ; j<w ; j++)
-                       {
-                               if (scrap_allocated[texnum][i+j] >= best)
-                                       break;
-                               if (scrap_allocated[texnum][i+j] > best2)
-                                       best2 = scrap_allocated[texnum][i+j];
-                       }
-                       if (j == w)
-                       {       // this is a valid spot
-                               *x = i;
-                               *y = best = best2;
-                       }
+                       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;
                }
-
-               if (best + h > BLOCK_HEIGHT)
-                       continue;
-
-               for (i=0 ; i<w ; i++)
-                       scrap_allocated[texnum][*x + i] = best + h;
-
-               return texnum;
        }
-
-       Sys_Error ("Scrap_AllocBlock: full");
-       return 0;
+       return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
-int    scrap_uploads;
-int scraptexnum[MAX_SCRAPS];
-
-void Scrap_Upload (void)
+static char *crosshairtexdata[NUMCROSSHAIRS] =
 {
-       int             texnum;
-
-       scrap_uploads++;
-
-       for (texnum=0 ; texnum<MAX_SCRAPS ; texnum++)
-               scraptexnum[texnum] = GL_LoadTexture (va("scrapslot%d", texnum), BLOCK_WIDTH, BLOCK_HEIGHT, scrap_texels[texnum], false, true, 1);
-       scrap_dirty = false;
-}
-
-//=============================================================================
-/* Support Routines */
-
-typedef struct cachepic_s
+       "................"
+       "................"
+       "................"
+       "...33......33..."
+       "...355....553..."
+       "....577..775...."
+       ".....77..77....."
+       "................"
+       "................"
+       ".....77..77....."
+       "....577..775...."
+       "...355....553..."
+       "...33......33..."
+       "................"
+       "................"
+       "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "...3........3..."
+       "....5......5...."
+       ".....7....7....."
+       "......7..7......"
+       "................"
+       "................"
+       "......7..7......"
+       ".....7....7....."
+       "....5......5...."
+       "...3........3..."
+       "................"
+       "................"
+       "................"
+       ,
+       "................"
+       ".......77......."
+       ".......77......."
+       "................"
+       "................"
+       ".......44......."
+       ".......44......."
+       ".77..44..44..77."
+       ".77..44..44..77."
+       ".......44......."
+       ".......44......."
+       "................"
+       "................"
+       ".......77......."
+       ".......77......."
+       "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "........7777777."
+       "........752....."
+       "........72......"
+       "........7......."
+       "........7......."
+       "........7......."
+       "........7......."
+       "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "........7......."
+       "................"
+       "........4......."
+       ".....7.4.4.7...."
+       "........4......."
+       "................"
+       "........7......."
+       "................"
+       "................"
+       "................"
+       "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       ".......55......."
+       ".......55......."
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+};
+
+static rtexture_t *draw_generatecrosshair(int num)
 {
-       char            name[MAX_QPATH];
-       qpic_t          pic;
-       byte            padding[32];    // for appended glpic
-} cachepic_t;
-
-#define        MAX_CACHED_PICS         128
-cachepic_t     menu_cachepics[MAX_CACHED_PICS];
-int                    menu_numcachepics;
-
-byte           menuplyr_pixels[4096];
-
-int            pic_texels;
-int            pic_count;
-
-int GL_LoadPicTexture (qpic_t *pic);
-
-qpic_t *Draw_PicFromWad (char *name)
-{
-       qpic_t  *p;
-       glpic_t *gl;
-
-       p = W_GetLumpName (name);
-       gl = (glpic_t *)p->data;
-
-       // load little ones into the scrap
-       if (p->width < 64 && p->height < 64)
+       int i;
+       char *in;
+       unsigned char data[16*16][4];
+       in = crosshairtexdata[num];
+       for (i = 0;i < 16*16;i++)
        {
-               int             x, y;
-               int             i, j, k;
-               int             texnum;
-
-               texnum = Scrap_AllocBlock (p->width, p->height, &x, &y);
-               scrap_dirty = true;
-               k = 0;
-               for (i=0 ; i<p->height ; i++)
-                       for (j=0 ; j<p->width ; j++, k++)
-                               scrap_texels[texnum][(y+i)*BLOCK_WIDTH + x + j] = p->data[k];
-               if (!scraptexnum[texnum])
-                       scraptexnum[texnum] = GL_LoadTexture (va("scrapslot%d", texnum), BLOCK_WIDTH, BLOCK_HEIGHT, scrap_texels[texnum], false, true, 1);
-               gl->texnum = scraptexnum[texnum];
-               gl->sl = (x+0.01)/(float)BLOCK_WIDTH;
-               gl->sh = (x+p->width-0.01)/(float)BLOCK_WIDTH;
-               gl->tl = (y+0.01)/(float)BLOCK_WIDTH;
-               gl->th = (y+p->height-0.01)/(float)BLOCK_WIDTH;
-
-               pic_count++;
-               pic_texels += p->width*p->height;
+               if (in[i] == '.')
+               {
+                       data[i][0] = 255;
+                       data[i][1] = 255;
+                       data[i][2] = 255;
+                       data[i][3] = 0;
+               }
+               else
+               {
+                       data[i][0] = 255;
+                       data[i][1] = 255;
+                       data[i][2] = 255;
+                       data[i][3] = (unsigned char) ((int) (in[i] - '0') * 255 / 7);
+               }
        }
-       else
+       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;
+       unsigned char data[8*8*4];
+       for (y = 0;y < 8;y++)
        {
-               gl->texnum = GL_LoadPicTexture (p);
-               gl->sl = 0;
-               gl->sh = 1;
-               gl->tl = 0;
-               gl->th = 1;
+               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 p;
+       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
 }
 
-
 /*
 ================
 Draw_CachePic
 ================
 */
-qpic_t *Draw_CachePic (char *path)
+// FIXME: move this to client somehow
+cachepic_t     *Draw_CachePic (const char *path, qboolean persistent)
 {
-       cachepic_t      *pic;
-       int                     i;
-       qpic_t          *dat;
-       glpic_t         *gl;
+       int crc, hashkey;
+       cachepic_t *pic;
+       qpic_t *p;
+       int flags;
+
+       if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
+       {
+               clvideo_t *video;
 
-       for (pic=menu_cachepics, i=0 ; i<menu_numcachepics ; pic++, i++)
+               video = CL_GetVideoByName(path);
+               if( video )
+                       return &video->cpif;
+       }
+
+       crc = CRC_Block((unsigned char *)path, strlen(path));
+       hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
+       for (pic = cachepichash[hashkey];pic;pic = pic->chain)
                if (!strcmp (path, pic->name))
-                       return &pic->pic;
-
-       if (menu_numcachepics == MAX_CACHED_PICS)
-               Sys_Error ("menu_numcachepics == MAX_CACHED_PICS");
-       menu_numcachepics++;
-       strcpy (pic->name, path);
-
-//
-// load the pic from disk
-//
-       dat = (qpic_t *)COM_LoadTempFile (path, false);
-       if (!dat)
-               Sys_Error ("Draw_CachePic: failed to load %s", path);
-       SwapPic (dat);
-
-       // HACK HACK HACK --- we need to keep the bytes for
-       // the translatable player picture just for the menu
-       // configuration dialog
-       if (!strcmp (path, "gfx/menuplyr.lmp"))
-               memcpy (menuplyr_pixels, dat->data, dat->width*dat->height);
-
-       pic->pic.width = dat->width;
-       pic->pic.height = dat->height;
-
-       gl = (glpic_t *)pic->pic.data;
-       gl->texnum = GL_LoadPicTexture (dat);
-       gl->sl = 0;
-       gl->sh = 1;
-       gl->tl = 0;
-       gl->th = 1;
-
-       return &pic->pic;
+                       return pic;
+
+       if (numcachepics == MAX_CACHED_PICS)
+       {
+               Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS\n");
+               // FIXME: support NULL in callers?
+               return cachepics; // return the first one
+       }
+       pic = cachepics + (numcachepics++);
+       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"))
+               flags |= TEXF_CLAMP;
+
+       // load the pic from disk
+       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, flags);
+               // failed to find gfx/whatever.tga or similar, try the wad
+               if (pic->tex == NULL && (p = (qpic_t *)W_GetLumpName (path + 4)))
+               {
+                       if (!strcmp(path, "gfx/conchars"))
+                       {
+                               // conchars is a raw image and with color 0 as transparent instead of 255
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, (unsigned char *)p, TEXTYPE_PALETTE, flags, palette_font);
+                       }
+                       else
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_transparent);
+               }
+       }
+
+       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)
+       {
+               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;
 }
 
-/*
-void Draw_CharToConback (int num, byte *dest)
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels)
 {
-       int             row, col;
-       byte    *source;
-       int             drawline;
-       int             x;
+       int crc, hashkey;
+       cachepic_t *pic;
 
-       row = num>>4;
-       col = num&15;
-       source = draw_chars + (row<<10) + (col<<3);
+       crc = CRC_Block((unsigned char *)picname, strlen(picname));
+       hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
+       for (pic = cachepichash[hashkey];pic;pic = pic->chain)
+               if (!strcmp (picname, pic->name))
+                       break;
 
-       drawline = 8;
-
-       while (drawline--)
+       if (pic)
        {
-               for (x=0 ; x<8 ; x++)
-                       if (source[x] != 255)
-                               dest[x] = 0x60 + source[x];
-               source += 128;
-               dest += 320;
+               if (pic->tex && pic->width == width && pic->height == height)
+               {
+                       R_UpdateTexture(pic->tex, pixels, 0, 0, width, height);
+                       return pic;
+               }
+       }
+       else
+       {
+               if (pic == NULL)
+               {
+                       if (numcachepics == MAX_CACHED_PICS)
+                       {
+                               Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
+                               // FIXME: support NULL in callers?
+                               return cachepics; // return the first one
+                       }
+                       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;
 }
-*/
 
-extern void LoadSky_f(void);
-
-extern char *QSG_EXTENSIONS;
+void Draw_FreePic(const 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((unsigned char *)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
 ===============
 */
-void rmain_registercvars();
-extern int buildnumber;
-
-void gl_draw_start()
+static void gl_draw_start(void)
 {
-       int             i;
-       glpic_t *gl;
-
-       // load the console background and the charset
-       // by hand, because we need to write the version
-       // string into the background before turning
-       // it into a texture
-       char_texture = loadtextureimage ("conchars", 0, 0, false, false);
-       if (!char_texture)
-       {
-               draw_chars = W_GetLumpName ("conchars");
-               for (i=0 ; i<256*64 ; i++)
-                       if (draw_chars[i] == 0)
-                               draw_chars[i] = 255;    // proper transparent color
+       int i;
+       drawtexturepool = R_AllocTexturePool();
 
-               // now turn them into textures
-               char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1);
-       }
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
 
-       gl = (glpic_t *)conback->data;
-       gl->texnum = loadtextureimage("gfx/conback", 0, 0, false, false);
-       gl->sl = 0;
-       gl->sh = 1;
-       gl->tl = 0;
-       gl->th = 1;
-       conback->width = vid.width;
-       conback->height = vid.height;
+       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);
+}
 
-       memset(scraptexnum, 0, sizeof(scraptexnum));
+static void gl_draw_shutdown(void)
+{
+       R_FreeTexturePool(&drawtexturepool);
 
-       // get the other pics we need
-       draw_disc = Draw_PicFromWad ("disc");
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
 }
 
-void gl_draw_shutdown()
+static void gl_draw_newmap(void)
 {
 }
 
-char engineversion[40];
-int engineversionx, engineversiony;
-
-extern void GL_Textures_Init();
 void GL_Draw_Init (void)
 {
-       int i;
-       Cvar_RegisterVariable (&qsg_version);
-       Cvar_RegisterVariable (&scr_conalpha);
-
-       Cmd_AddCommand ("loadsky", &LoadSky_f);
-
-#ifdef NEHAHRA
-#if defined(__linux__)
-       sprintf (engineversion, "DPNehahra Linux   GL %.2f build %3i", (float) VERSION, buildnumber);
-#elif defined(WIN32)
-       sprintf (engineversion, "DPNehahra Windows GL %.2f build %3i", (float) VERSION, buildnumber);
-#else
-       sprintf (engineversion, "DPNehahra Unknown GL %.2f build %3i", (float) VERSION, buildnumber);
-#endif
-#else
-#if defined(__linux__)
-       sprintf (engineversion, "DarkPlaces Linux   GL %.2f build %3i", (float) VERSION, buildnumber);
-#elif defined(WIN32)
-       sprintf (engineversion, "DarkPlaces Windows GL %.2f build %3i", (float) VERSION, buildnumber);
-#else
-       sprintf (engineversion, "DarkPlaces Unknown GL %.2f build %3i", (float) VERSION, buildnumber);
-#endif
-#endif
-       for (i = 0;i < 40 && engineversion[i];i++)
-               engineversion[i] += 0x80; // shift to orange
-       engineversionx = vid.width - strlen(engineversion) * 8 - 8;
-       engineversiony = vid.height - 8;
-
-       GL_Textures_Init();
-       R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown);
+       Cvar_RegisterVariable(&r_textshadow);
+       R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
 }
 
-/*
-================
-Draw_Character
-
-Draws one 8*8 graphics character with 0 being transparent.
-It can be clipped to the top of the screen to allow the console to be
-smoothly scrolled off.
-================
-*/
-void Draw_Character (int x, int y, int num)
+void DrawQ_Begin(void)
 {
-       int                             row, col;
-       float                   frow, fcol, size;
+       GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1);
 
-       if (num == 32)
-               return;         // space
+       CHECKGLERROR
+       qglViewport(r_view.x, vid.height - (r_view.y + r_view.height), r_view.width, r_view.height);CHECKGLERROR
+       GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+       qglDepthFunc(GL_LEQUAL);CHECKGLERROR
+       R_Mesh_Matrix(&identitymatrix);
 
-       num &= 255;
-       
-       if (y <= -8)
-               return;                 // totally off screen
+       GL_DepthMask(true);
+       GL_DepthTest(false);
+       GL_Color(1,1,1,1);
 
-       row = num>>4;
-       col = num&15;
+       r_refdef.draw2dstage = true;
+}
 
-       frow = row*0.0625;
-       fcol = col*0.0625;
-       size = 0.0625;
+static void _DrawQ_ProcessDrawFlag(int flags)
+{
+       CHECKGLERROR
+       if(flags == DRAWFLAG_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else if(flags == DRAWFLAG_MODULATE)
+               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+       else if(flags == DRAWFLAG_2XMODULATE)
+               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+}
 
-       if (!r_render.value)
-               return;
-       glBindTexture(GL_TEXTURE_2D, char_texture);
-       // LordHavoc: NEAREST mode on text if not scaling up
-       if ((int) vid.width < glwidth)
+void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
+{
+       if (!r_refdef.draw2dstage)
        {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-       }
-
-       glColor3f(1,1,1);
-       glBegin (GL_QUADS);
-       glTexCoord2f (fcol, frow);
-       glVertex2f (x, y);
-       glTexCoord2f (fcol + size, frow);
-       glVertex2f (x+8, y);
-       glTexCoord2f (fcol + size, frow + size);
-       glVertex2f (x+8, y+8);
-       glTexCoord2f (fcol, frow + size);
-       glVertex2f (x, y+8);
-       glEnd ();
-
-       // LordHavoc: revert to LINEAR mode
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+               Con_Printf("DrawQ_Pic: not in 2d rendering stage!\n");
+               return;
+       }
+       DrawQ_SuperPic(x,y,pic,width,height,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
 }
 
-/*
-================
-Draw_String
-================
-*/
-// LordHavoc: sped this up a lot, and added maxlen
-void Draw_String (int x, int y, char *str, int maxlen)
+void DrawQ_String_Real(float x, float y, const char *string, int maxlen, float w, float h, float red, float green, float blue, float alpha, int flags)
 {
-       int num;
-       float frow, fcol;
-       if (!r_render.value)
-               return;
-       if (y <= -8 || y >= (int) vid.height || x >= (int) vid.width || *str == 0) // completely offscreen or no text to print
-               return;
-       if (maxlen < 1)
-               maxlen = strlen(str);
-       else if (maxlen > (int) strlen(str))
-               maxlen = strlen(str);
-       glBindTexture(GL_TEXTURE_2D, char_texture);
+       int i, num;
+       float *av, *at;
+       int batchcount;
+       float vertex3f[QUADELEMENTS_MAXQUADS*4*3];
+       float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
 
-       // LordHavoc: NEAREST mode on text if not scaling up
-       if ((int) vid.width < glwidth)
+       if (!r_refdef.draw2dstage)
        {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+               Con_Printf("DrawQ_String: not in 2d rendering stage!\n");
+               return;
        }
 
-       glColor3f(1,1,1);
-       glBegin (GL_QUADS);
-       while (maxlen-- && x < (int) vid.width) // stop rendering when out of characters or room
+       if (alpha < (1.0f / 255.0f))
+               return;
+
+       _DrawQ_ProcessDrawFlag(flags);
+
+       GL_Color(red, green, blue, alpha);
+
+       R_Mesh_VertexPointer(vertex3f);
+       R_Mesh_ColorPointer(NULL);
+       R_Mesh_ResetTextureState();
+       R_Mesh_TexBind(0, R_GetTexture(char_texture));
+       R_Mesh_TexCoordPointer(0, 2, texcoord2f);
+
+       at = texcoord2f;
+       av = vertex3f;
+       batchcount = 0;
+
+       if (maxlen < 1)
+               maxlen = 9999;
+       for (i = 0;i < maxlen && x < vid_conwidth.integer && (num = string[i]);i++, x += w)
        {
-               if ((num = *str++) != 32) // skip spaces
+               float s, t, u, v;
+               if (num == ' ')
+                       continue;
+               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);
+               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 >= QUADELEMENTS_MAXQUADS)
                {
-                       frow = (float) ((int) num >> 4)*0.0625;
-                       fcol = (float) ((int) num & 15)*0.0625;
-                       glTexCoord2f (fcol, frow);
-                       glVertex2f (x, y);
-                       glTexCoord2f (fcol + 0.0625, frow);
-                       glVertex2f (x+8, y);
-                       glTexCoord2f (fcol + 0.0625, frow + 0.0625);
-                       glVertex2f (x+8, y+8);
-                       glTexCoord2f (fcol, frow + 0.0625);
-                       glVertex2f (x, y+8);
+                       GL_LockArrays(0, batchcount * 4);
+                       R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+                       GL_LockArrays(0, 0);
+                       batchcount = 0;
+                       at = texcoord2f;
+                       av = vertex3f;
                }
-               x += 8;
        }
-       glEnd ();
-
-       // LordHavoc: revert to LINEAR mode
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+       if (batchcount > 0)
+       {
+               GL_LockArrays(0, batchcount * 4);
+               R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+               GL_LockArrays(0, 0);
+       }
 }
 
-void Draw_GenericPic (int texnum, float red, float green, float blue, float alpha, float x, float y, float width, float height)
+void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
 {
-       if (!r_render.value)
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_String: not in 2d rendering stage!\n");
                return;
-       glDisable(GL_ALPHA_TEST);
-//     glEnable (GL_BLEND);
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//     glCullFace(GL_FRONT);
-       glColor4f(red,green,blue,alpha);
-       glBindTexture(GL_TEXTURE_2D, texnum);
-       glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-       glBegin (GL_QUADS);
-       glTexCoord2f (0, 0);
-       glVertex2f (x, y);
-       glTexCoord2f (1, 0);
-       glVertex2f (x+width, y);
-       glTexCoord2f (1, 1);
-       glVertex2f (x+width, y+height);
-       glTexCoord2f (0, 1);
-       glVertex2f (x, y+height);
-       glEnd ();
-       glColor3f(1,1,1);
-//     glEnable(GL_ALPHA_TEST);
-//     glDisable (GL_BLEND);
+       }
+
+       if (r_textshadow.integer)
+               DrawQ_String_Real(x+scalex*0.25,y+scaley*0.25,string,maxlen,scalex,scaley,0,0,0,alpha*0.8,flags);
+
+       DrawQ_String_Real(x,y,string,maxlen,scalex,scaley,red,green,blue,alpha,flags);
 }
 
-/*
-=============
-Draw_AlphaPic
-=============
-*/
-void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha)
+// color tag printing
+static vec4_t string_colors[] =
 {
-       glpic_t                 *gl;
+       // Quake3 colors
+       // LordHavoc: why on earth is cyan before magenta in Quake3?
+       // LordHavoc: note: Doom3 uses white for [0] and [7]
+       {0.0, 0.0, 0.0, 1.0}, // black
+       {1.0, 0.0, 0.0, 1.0}, // red
+       {0.0, 1.0, 0.0, 1.0}, // green
+       {1.0, 1.0, 0.0, 1.0}, // yellow
+       {0.0, 0.0, 1.0, 1.0}, // blue
+       {0.0, 1.0, 1.0, 1.0}, // cyan
+       {1.0, 0.0, 1.0, 1.0}, // magenta
+       {1.0, 1.0, 1.0, 1.0}, // white
+       // [515]'s BX_COLOREDTEXT extension
+       {1.0, 1.0, 1.0, 0.5}, // half transparent
+       {0.5, 0.5, 0.5, 1.0}  // half brightness
+       // Black's color table
+       //{1.0, 1.0, 1.0, 1.0},
+       //{1.0, 0.0, 0.0, 1.0},
+       //{0.0, 1.0, 0.0, 1.0},
+       //{0.0, 0.0, 1.0, 1.0},
+       //{1.0, 1.0, 0.0, 1.0},
+       //{0.0, 1.0, 1.0, 1.0},
+       //{1.0, 0.0, 1.0, 1.0},
+       //{0.1, 0.1, 0.1, 1.0}
+};
+
+#define STRING_COLORS_COUNT    (sizeof(string_colors) / sizeof(vec4_t))
+
+// color is read and changed in the end
+void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor )
+{
+       vec_t *color;
+       int len;
+       int colorindex;
+       const char *start, *current;
 
-       if (scrap_dirty)
-               Scrap_Upload ();
-       gl = (glpic_t *)pic->data;
-       if (!r_render.value)
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_ColoredString: not in 2d rendering stage!\n");
                return;
-       glColor4f(1,1,1,alpha);
-       glBindTexture(GL_TEXTURE_2D, gl->texnum);
-       glBegin (GL_QUADS);
-       glTexCoord2f (gl->sl, gl->tl);
-       glVertex2f (x, y);
-       glTexCoord2f (gl->sh, gl->tl);
-       glVertex2f (x+pic->width, y);
-       glTexCoord2f (gl->sh, gl->th);
-       glVertex2f (x+pic->width, y+pic->height);
-       glTexCoord2f (gl->sl, gl->th);
-       glVertex2f (x, y+pic->height);
-       glEnd ();
-}
+       }
+       if( !outcolor || *outcolor == -1 ) {
+               colorindex = STRING_COLOR_DEFAULT;
+       } else {
+               colorindex = *outcolor;
+       }
+       color = string_colors[colorindex];
 
+       if( maxlen < 1)
+               len = (int)strlen( text );
+       else
+               len = min( maxlen, (int) strlen( text ) );
+
+       start = current = text;
+       while( len > 0 ) {
+               // check for color control char
+               if( *current == STRING_COLOR_TAG ) {
+                       // get next char
+                       current++;
+                       len--;
+                       if( len == 0 ) {
+                               break;
+                       }
+                       // display the tag char?
+                       if( *current == STRING_COLOR_TAG ) {
+                               // only display one of the two
+                               start = current;
+                               // get the next char
+                               current++;
+                               len--;
+                       } else if( '0' <= *current && *current <= '9' ) {
+                               colorindex = 0;
+                               do {
+                                       colorindex = colorindex * 10 + (*current - '0');
+                                       // only read as long as it makes a valid index
+                                       if( colorindex >= (int)STRING_COLORS_COUNT ) {
+                                               // undo the last operation
+                                               colorindex /= 10;
+                                               break;
+                                       }
+                                       current++;
+                                       len--;
+                               } while( len > 0 && '0' <= *current && *current <= '9' );
+                               // set the color
+                               color = string_colors[colorindex];
+                               // we jump over the color tag
+                               start = current;
+                       }
+               }
+               // go on and read normal text in until the next control char
+               while( len > 0 && *current != STRING_COLOR_TAG ) {
+                       current++;
+                       len--;
+               }
+               // display the text
+               if( start != current ) {
+                       // draw the string
+                       DrawQ_String( x, y, start, current - start, scalex, scaley, basered * color[0], basegreen * color[1], baseblue * color[2], basealpha * color[3], flags );
+                       // update x to be at the new start position
+                       x += (current - start) * scalex;
+                       // set start accordingly
+                       start = current;
+               }
+       }
 
-/*
-=============
-Draw_Pic
-=============
-*/
-void Draw_Pic (int x, int y, qpic_t *pic)
+       // return the last colorindex
+       if( outcolor ) {
+               *outcolor = colorindex;
+       }
+}
+
+void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
 {
-       glpic_t                 *gl;
+       float floats[36];
 
-       if (scrap_dirty)
-               Scrap_Upload ();
-       gl = (glpic_t *)pic->data;
-       if (!r_render.value)
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_SuperPic: not in 2d rendering stage!\n");
                return;
-       glColor3f(1,1,1);
-       glBindTexture(GL_TEXTURE_2D, gl->texnum);
-       glBegin (GL_QUADS);
-       glTexCoord2f (gl->sl, gl->tl);
-       glVertex2f (x, y);
-       glTexCoord2f (gl->sh, gl->tl);
-       glVertex2f (x+pic->width, y);
-       glTexCoord2f (gl->sh, gl->th);
-       glVertex2f (x+pic->width, y+pic->height);
-       glTexCoord2f (gl->sl, gl->th);
-       glVertex2f (x, y+pic->height);
-       glEnd ();
-}
+       }
 
+       _DrawQ_ProcessDrawFlag(flags);
 
-/*
-=============
-Draw_PicTranslate
+       R_Mesh_VertexPointer(floats);
+       R_Mesh_ColorPointer(floats + 20);
+       R_Mesh_ResetTextureState();
+       if (pic)
+       {
+               if (width == 0)
+                       width = pic->width;
+               if (height == 0)
+                       height = pic->height;
+               R_Mesh_TexBind(0, R_GetTexture(pic->tex));
+               R_Mesh_TexCoordPointer(0, 2, floats + 12);
+               floats[12] = s1;floats[13] = t1;
+               floats[14] = s2;floats[15] = t2;
+               floats[16] = s4;floats[17] = t4;
+               floats[18] = s3;floats[19] = t3;
+       }
 
-Only used for the player color selection menu
-=============
-*/
-void Draw_PicTranslate (int x, int y, qpic_t *pic, byte *translation)
+       floats[2] = floats[5] = floats[8] = floats[11] = 0;
+       floats[0] = floats[9] = x;
+       floats[1] = floats[4] = y;
+       floats[3] = floats[6] = x + width;
+       floats[7] = floats[10] = y + height;
+       floats[20] = r1;floats[21] = g1;floats[22] = b1;floats[23] = a1;
+       floats[24] = r2;floats[25] = g2;floats[26] = b2;floats[27] = a2;
+       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);
+}
+
+void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
 {
-       int                             i, c;
-       byte                    *trans, *src, *dest;
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_Mesh: not in 2d rendering stage!\n");
+               return;
+       }
 
-       c = pic->width * pic->height;
-       src = menuplyr_pixels;
-       dest = trans = malloc(c);
-       for (i = 0;i < c;i++)
-               *dest++ = translation[*src++];
+       _DrawQ_ProcessDrawFlag(flags);
 
-       c = GL_LoadTexture ("translatedplayerpic", pic->width, pic->height, trans, false, true, 1);
-       free(trans);
+       R_Mesh_VertexPointer(mesh->data_vertex3f);
+       R_Mesh_ColorPointer(mesh->data_color4f);
+       R_Mesh_ResetTextureState();
+       R_Mesh_TexBind(0, R_GetTexture(mesh->texture));
+       R_Mesh_TexCoordPointer(0, 2, mesh->data_texcoord2f);
 
-       if (!r_render.value)
-               return;
-       glBindTexture(GL_TEXTURE_2D, c);
-       glColor3f(1,1,1);
-       glBegin (GL_QUADS);
-       glTexCoord2f (0, 0);
-       glVertex2f (x, y);
-       glTexCoord2f (1, 0);
-       glVertex2f (x+pic->width, y);
-       glTexCoord2f (1, 1);
-       glVertex2f (x+pic->width, y+pic->height);
-       glTexCoord2f (0, 1);
-       glVertex2f (x, y+pic->height);
-       glEnd ();
+       GL_LockArrays(0, mesh->num_vertices);
+       R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+       GL_LockArrays(0, 0);
 }
 
+void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
+{
+       int num;
 
-/*
-================
-Draw_ConsoleBackground
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_LineLoop: not in 2d rendering stage!\n");
+               return;
+       }
 
-================
-*/
-void Draw_ConsoleBackground (int lines)
-{
-       // LordHavoc: changed alpha
-       //int y = (vid.height >> 1);
+       _DrawQ_ProcessDrawFlag(flags);
 
-       if (lines >= (int) vid.height)
-               Draw_Pic(0, lines - vid.height, conback);
-       else
-               Draw_AlphaPic (0, lines - vid.height, conback, scr_conalpha.value*lines/vid.height);
-       //      Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y);
-       // LordHavoc: draw version
-       Draw_String(engineversionx, lines - vid.height + engineversiony, engineversion, 9999);
+       GL_Color(1,1,1,1);
+       CHECKGLERROR
+       qglBegin(GL_LINE_LOOP);
+       for (num = 0;num < mesh->num_vertices;num++)
+       {
+               if (mesh->data_color4f)
+                       GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]);
+               qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+       }
+       qglEnd();
+       CHECKGLERROR
 }
 
-/*
-=============
-Draw_Fill
+//LordHavoc: FIXME: this is nasty!
+void DrawQ_LineWidth (float width)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_LineWidth: not in 2d rendering stage!\n");
+               return;
+       }
+       CHECKGLERROR
+       qglLineWidth(width);CHECKGLERROR
+}
 
-Fills a box of pixels with a single color
-=============
-*/
-void Draw_Fill (int x, int y, int w, int h, int c)
+//[515]: this is old, delete
+void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
 {
-       if (!r_render.value)
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_Line: not in 2d rendering stage!\n");
                return;
-       glDisable (GL_TEXTURE_2D);
-       glColor3f (host_basepal[c*3]/255.0, host_basepal[c*3+1]/255.0, host_basepal[c*3+2]/255.0);
+       }
 
-       glBegin (GL_QUADS);
+       CHECKGLERROR
+       if(width > 0)
+               DrawQ_LineWidth(width);
 
-       glVertex2f (x,y);
-       glVertex2f (x+w, y);
-       glVertex2f (x+w, y+h);
-       glVertex2f (x, y+h);
+       _DrawQ_ProcessDrawFlag(flags);
 
-       glEnd ();
-       glColor3f(1,1,1);
-       glEnable (GL_TEXTURE_2D);
+       GL_Color(r,g,b,alpha);
+       CHECKGLERROR
+       qglBegin(GL_LINES);
+       qglVertex2f(x1, y1);
+       qglVertex2f(x2, y2);
+       qglEnd();
+       CHECKGLERROR
 }
-//=============================================================================
 
-//=============================================================================
-
-/*
-================
-GL_Set2D
-
-Setup as if the screen was 320*200
-================
-*/
-void GL_Set2D (void)
+void DrawQ_SetClipArea(float x, float y, float width, float height)
 {
-       if (!r_render.value)
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_SetClipArea: not in 2d rendering stage!\n");
                return;
-       glViewport (glx, gly, glwidth, glheight);
-
-       glMatrixMode(GL_PROJECTION);
-    glLoadIdentity ();
-       glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);
-
-       glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity ();
+       }
 
-       glDisable (GL_DEPTH_TEST);
-       glDisable (GL_CULL_FACE);
-       glEnable (GL_BLEND); // was Disable
-//     glEnable (GL_ALPHA_TEST);
-       glDisable (GL_ALPHA_TEST);
-       glEnable(GL_TEXTURE_2D);
+       // We have to convert the con coords into real coords
+       // OGL uses top to bottom
+       GL_Scissor((int)(x * ((float)vid.width / vid_conwidth.integer)), (int)(y * ((float) vid.height / vid_conheight.integer)), (int)(width * ((float)vid.width / vid_conwidth.integer)), (int)(height * ((float)vid.height / vid_conheight.integer)));
 
-       // LordHavoc: added this
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+       GL_ScissorTest(true);
+}
 
-       glColor3f(1,1,1);
+void DrawQ_ResetClipArea(void)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_ResetClipArea: not in 2d rendering stage!\n");
+               return;
+       }
+       GL_ScissorTest(false);
 }
 
-// LordHavoc: SHOWLMP stuff
-#define SHOWLMP_MAXLABELS 256
-typedef struct showlmp_s
+void DrawQ_Finish(void)
 {
-       qboolean        isactive;
-       float           x;
-       float           y;
-       char            label[32];
-       char            pic[128];
-} showlmp_t;
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("R_DrawQueue: not in 2d rendering stage!\n");
+               return;
+       }
 
-showlmp_t showlmp[SHOWLMP_MAXLABELS];
+       r_refdef.draw2dstage = false;
+}
 
-void SHOWLMP_decodehide()
+static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
+void R_DrawGamma(void)
 {
-       int i;
-       byte *lmplabel;
-       lmplabel = MSG_ReadString();
-       for (i = 0;i < SHOWLMP_MAXLABELS;i++)
-               if (showlmp[i].isactive && strcmp(showlmp[i].label, lmplabel) == 0)
+       float c[4];
+       if (!vid_usinghwgamma)
+       {
+               // all the blends ignore depth
+               R_Mesh_VertexPointer(blendvertex3f);
+               R_Mesh_ColorPointer(NULL);
+               R_Mesh_ResetTextureState();
+               GL_DepthMask(true);
+               GL_DepthTest(false);
+               if (v_color_enable.integer)
                {
-                       showlmp[i].isactive = false;
-                       return;
+                       c[0] = v_color_white_r.value;
+                       c[1] = v_color_white_g.value;
+                       c[2] = v_color_white_b.value;
                }
-}
-
-void SHOWLMP_decodeshow()
-{
-       int i, k;
-       byte lmplabel[256], picname[256];
-       float x, y;
-       strcpy(lmplabel,MSG_ReadString());
-       strcpy(picname, MSG_ReadString());
-       x = MSG_ReadByte();
-       y = MSG_ReadByte();
-       k = -1;
-       for (i = 0;i < SHOWLMP_MAXLABELS;i++)
-               if (showlmp[i].isactive)
+               else
+                       c[0] = c[1] = c[2] = v_contrast.value;
+               if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
                {
-                       if (strcmp(showlmp[i].label, lmplabel) == 0)
+                       GL_BlendFunc(GL_DST_COLOR, GL_ONE);
+                       while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
                        {
-                               k = i;
-                               break; // drop out to replace it
+                               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);
                        }
                }
-               else if (k < 0) // find first empty one to replace
-                       k = i;
-       if (k < 0)
-               return; // none found to replace
-       // change existing one
-       showlmp[k].isactive = true;
-       strcpy(showlmp[k].label, lmplabel);
-       strcpy(showlmp[k].pic, picname);
-       showlmp[k].x = x;
-       showlmp[k].y = y;
-}
-
-void SHOWLMP_drawall()
-{
-       int i;
-       for (i = 0;i < SHOWLMP_MAXLABELS;i++)
-               if (showlmp[i].isactive)
-                       Draw_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic));
+               if (v_color_enable.integer)
+               {
+                       c[0] = v_color_black_r.value;
+                       c[1] = v_color_black_g.value;
+                       c[2] = v_color_black_b.value;
+               }
+               else
+                       c[0] = c[1] = c[2] = v_brightness.value;
+               if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f)
+               {
+                       GL_BlendFunc(GL_ONE, GL_ONE);
+                       GL_Color(c[0], c[1], c[2], 1);
+                       R_Mesh_Draw(0, 3, 1, polygonelements);
+               }
+       }
 }
 
-void SHOWLMP_clear()
-{
-       int i;
-       for (i = 0;i < SHOWLMP_MAXLABELS;i++)
-               showlmp[i].isactive = false;
-}