]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_draw.c
Cleaned up alot more memory leaks. (still get 720 leaks just running demo1.dem)
[xonotic/darkplaces.git] / gl_draw.c
index bf3de8f98252d974c1098baaca33aa57e3aa9236..378bf682e38f0e3660aa550c8ca931b980256729 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,536 +18,637 @@ 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
-
-cvar_t         scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
+#include "cl_video.h"
 
-byte           *draw_chars;                            // 8*8 graphic characters
-qpic_t         *draw_disc;
 
-rtexture_t     *char_texture;
-
-typedef struct
-{
-       rtexture_t      *tex;
-} glpic_t;
-
-rtexture_t     *conbacktex;
+static rtexture_t *char_texture;
 
 //=============================================================================
 /* Support Routines */
 
-typedef struct cachepic_s
-{
-       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;
+#define MAX_CACHED_PICS 256
+#define CACHEPICHASHSIZE 256
+static cachepic_t *cachepichash[CACHEPICHASHSIZE];
+static cachepic_t cachepics[MAX_CACHED_PICS];
+static int numcachepics;
 
-byte           menuplyr_pixels[4096];
+static rtexturepool_t *drawtexturepool;
 
-int            pic_texels;
-int            pic_count;
-
-qpic_t *Draw_PicFromWad (char *name)
+static qbyte concharimage[11356] =
 {
-       qpic_t  *p;
-       glpic_t *gl;
-
-       p = W_GetLumpName (name);
-       gl = (glpic_t *)p->data;
-
-       gl->tex = R_LoadTexture (name, p->width, p->height, p->data, TEXF_ALPHA | TEXF_PRECACHE);
-       return p;
-}
+#include "lhfont.h"
+};
 
+extern qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight);
 
-/*
-================
-Draw_CachePic
-================
-*/
-qpic_t *Draw_CachePic (char *path)
+static rtexture_t *draw_generateconchars(void)
 {
-       cachepic_t      *pic;
-       int                     i;
-       qpic_t          *dat;
-       glpic_t         *gl;
-
-       for (pic=menu_cachepics, i=0 ; i<menu_numcachepics ; pic++, i++)
-               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_LoadMallocFile (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->tex = loadtextureimage(path, 0, 0, false, false, true);
-       if (!gl->tex)
-               gl->tex = R_LoadTexture (path, dat->width, dat->height, dat->data, TEXF_ALPHA | TEXF_PRECACHE);
-
-       qfree(dat);
-
-       return &pic->pic;
-}
+       int i;
+       qbyte buffer[65536][4], *data = NULL;
 
-/*
-===============
-Draw_Init
-===============
-*/
-void gl_draw_start(void)
-{
-       int             i;
+       fs_filesize = 11356;
+       data = LoadTGA (concharimage, 256, 256);
+       fs_filesize = -1;
 
-       char_texture = loadtextureimage ("conchars", 0, 0, false, false, true);
-       if (!char_texture)
+       for (i = 0;i < 32768;i++)
        {
-               draw_chars = W_GetLumpName ("conchars");
-               for (i=0 ; i<128*128 ; i++)
-                       if (draw_chars[i] == 0)
-                               draw_chars[i] = 255;    // proper transparent color
-
-               // now turn them into textures
-               char_texture = R_LoadTexture ("charset", 128, 128, draw_chars, TEXF_ALPHA | TEXF_PRECACHE);
+               buffer[i][0] = 255;
+               buffer[i][1] = 255;
+               buffer[i][2] = 255;
+               buffer[i][3] = data[i*4+0];
        }
 
-       conbacktex = loadtextureimage("gfx/conback", 0, 0, false, false, true);
-
-       // get the other pics we need
-       draw_disc = Draw_PicFromWad ("disc");
+       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);
 }
 
-void gl_draw_shutdown(void)
+static qbyte pointerimage[256] =
 {
-}
-
-void gl_draw_newmap(void)
+       "333333332......."
+       "26777761........"
+       "2655541........."
+       "265541.........."
+       "2654561........."
+       "26414561........"
+       "251.14561......."
+       "21...14561......"
+       "1.....141......."
+       ".......1........"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+};
+
+static rtexture_t *draw_generatemousepointer(void)
 {
+       int i;
+       qbyte buffer[256][4];
+       for (i = 0;i < 256;i++)
+       {
+               if (pointerimage[i] == '.')
+               {
+                       buffer[i][0] = 0;
+                       buffer[i][1] = 0;
+                       buffer[i][2] = 0;
+                       buffer[i][3] = 0;
+               }
+               else
+               {
+                       buffer[i][0] = (pointerimage[i] - '0') * 16;
+                       buffer[i][1] = (pointerimage[i] - '0') * 16;
+                       buffer[i][2] = (pointerimage[i] - '0') * 16;
+                       buffer[i][3] = 255;
+               }
+       }
+       return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
-extern char engineversion[40];
-int engineversionx, engineversiony;
+// must match NUMCROSSHAIRS in r_crosshairs.c
+#define NUMCROSSHAIRS 5
 
-extern void R_Textures_Init();
-void GL_Draw_Init (void)
+static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
+{
+       "................"
+       "................"
+       "................"
+       "...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......."
+       "................"
+       "........4......."
+       ".....7.4.4.7...."
+       "........4......."
+       "................"
+       "........7......."
+       "................"
+       "................"
+       "................"
+       "................"
+};
+
+static rtexture_t *draw_generatecrosshair(int num)
 {
        int i;
-       Cvar_RegisterVariable (&scr_conalpha);
-
-       for (i = 0;i < 40 && engineversion[i];i++)
-               engineversion[i] += 0x80; // shift to orange
-       engineversionx = vid.conwidth - strlen(engineversion) * 8 - 8;
-       engineversiony = vid.conheight - 8;
+       char *in;
+       qbyte data[16*16][4];
+       in = crosshairtexdata[num];
+       for (i = 0;i < 16*16;i++)
+       {
+               if (in[i] == '.')
+               {
+                       data[i][0] = 255;
+                       data[i][1] = 255;
+                       data[i][2] = 255;
+                       data[i][3] = 0;
+               }
+               else
+               {
+                       data[i][0] = 255;
+                       data[i][1] = 255;
+                       data[i][2] = 255;
+                       data[i][3] = (qbyte) ((int) (in[i] - '0') * 255 / 7);
+               }
+       }
+       return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
 
-       R_Textures_Init();
-       R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
+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
 }
 
 /*
 ================
-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.
+Draw_CachePic
 ================
 */
-void Draw_Character (int x, int y, int num)
+// FIXME: move this to client somehow
+cachepic_t     *Draw_CachePic (char *path)
 {
-       int                             row, col;
-       float                   frow, fcol, size;
+       int i, crc, hashkey;
+       cachepic_t *pic;
+       qpic_t *p;
 
-       if (num == 32)
-               return;         // space
+       if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+               clvideo_t *video;
 
-       num &= 255;
-       
-       if (y <= -8)
-               return;                 // totally off screen
+               video = CL_GetVideo(path);
+               if( video )
+                       return &video->cpif;
+       }
 
-       row = num>>4;
-       col = num&15;
+       crc = CRC_Block(path, strlen(path));
+       hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
+       for (pic = cachepichash[hashkey];pic;pic = pic->chain)
+               if (!strcmp (path, pic->name))
+                       return pic;
 
-       frow = row*0.0625;
-       fcol = col*0.0625;
-       size = 0.0625;
+       if (numcachepics == MAX_CACHED_PICS)
+               Sys_Error ("numcachepics == MAX_CACHED_PICS");
+       pic = cachepics + (numcachepics++);
+       strcpy (pic->name, path);
+       // link into list
+       pic->chain = cachepichash[hashkey];
+       cachepichash[hashkey] = pic;
 
-       if (!r_render.value)
-               return;
-       glBindTexture(GL_TEXTURE_2D, R_GetTexture(char_texture));
-       // LordHavoc: NEAREST mode on text if not scaling up
-       if (vid.realwidth <= (int) vid.conwidth)
+       // load the pic from disk
+       pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+       if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
        {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+               // 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)))
+               {
+                       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
+
+       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"))
+               pic->tex = draw_generatecrosshair(1);
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3.tga"))
+               pic->tex = draw_generatecrosshair(2);
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4.tga"))
+               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)
        {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+               Con_Printf("Draw_CachePic: failed to load %s\n", path);
+               pic->tex = r_notexture;
        }
 
-       if (lighthalf)
-               glColor3f(0.5f,0.5f,0.5f);
-       else
-               glColor3f(1.0f,1.0f,1.0f);
-       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
-//     if (vid.realwidth <= (int) vid.conwidth)
-//     {
-//             glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-//             glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-//     }
+       pic->width = R_TextureWidth(pic->tex);
+       pic->height = R_TextureHeight(pic->tex);
+       return pic;
 }
 
-/*
-================
-Draw_String
-================
-*/
-// LordHavoc: sped this up a lot, and added maxlen
-void Draw_String (int x, int y, char *str, int maxlen)
+cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *pixels)
 {
-       int num;
-       float frow, fcol;
-       if (!r_render.value)
-               return;
-       if (y <= -8 || y >= (int) vid.conheight || x >= (int) vid.conwidth || *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, R_GetTexture(char_texture));
-
-       // LordHavoc: NEAREST mode on text if not scaling up
-       if (vid.realwidth <= (int) vid.conwidth)
-       {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-       }
-       else
+       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)
        {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+               if (pic->tex && pic->width == width && pic->height == height)
+               {
+                       R_UpdateTexture(pic->tex, pixels);
+                       return pic;
+               }
        }
-
-       if (lighthalf)
-               glColor3f(0.5f,0.5f,0.5f);
        else
-               glColor3f(1.0f,1.0f,1.0f);
-       glBegin (GL_QUADS);
-       while (maxlen-- && x < (int) vid.conwidth) // stop rendering when out of characters or room
        {
-               if ((num = *str++) != 32) // skip spaces
+               if (pic == NULL)
                {
-                       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);
+                       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;
                }
-               x += 8;
        }
-       glEnd ();
-
-       // LordHavoc: revert to LINEAR mode
-//     if (vid.realwidth < (int) vid.conwidth)
-//     {
-//             glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-//             glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-//     }
-}
 
-void Draw_AdditiveString (int x, int y, char *str, int maxlen)
-{
-       if (!r_render.value)
-               return;
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-       Draw_String(x, y, str, maxlen);
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       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_GenericPic (rtexture_t *tex, float red, float green, float blue, float alpha, int x, int y, int width, int height)
+void Draw_FreePic(char *picname)
 {
-       if (!r_render.value)
-               return;
-       if (lighthalf)
-               glColor4f(red * 0.5f, green * 0.5f, blue * 0.5f, alpha);
-       else
-               glColor4f(red, green, blue, alpha);
-       glBindTexture(GL_TEXTURE_2D, R_GetTexture(tex));
-       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 ();
-}
-
-/*
-=============
-Draw_AlphaPic
-=============
-*/
-void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha)
-{
-       if (pic)
-               Draw_GenericPic(((glpic_t *)pic->data)->tex, 1,1,1,alpha, x,y,pic->width, pic->height);
-}
-
-
-/*
-=============
-Draw_Pic
-=============
-*/
-void Draw_Pic (int x, int y, qpic_t *pic)
-{
-       if (pic)
-               Draw_GenericPic(((glpic_t *)pic->data)->tex, 1,1,1,1, x,y,pic->width, pic->height);
-}
-
-
-void Draw_AdditivePic (int x, int y, qpic_t *pic)
-{
-       if (pic)
+       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)
        {
-               glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-               Draw_GenericPic(((glpic_t *)pic->data)->tex, 1,1,1,1, x,y,pic->width, pic->height);
-               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               if (!strcmp (picname, pic->name) && pic->tex)
+               {
+                       R_FreeTexture(pic->tex);
+                       pic->width = 0;
+                       pic->height = 0;
+                       return;
+               }
        }
 }
 
-
 /*
-=============
-Draw_PicTranslate
-
-Only used for the player color selection menu
-=============
+===============
+Draw_Init
+===============
 */
-void Draw_PicTranslate (int x, int y, qpic_t *pic, byte *translation)
+static void gl_draw_start(void)
 {
-       int                             i, c;
-       byte                    *trans, *src, *dest;
-       rtexture_t              *rt;
-
-       if (pic == NULL)
-               return;
+       drawtexturepool = R_AllocTexturePool();
 
-       c = pic->width * pic->height;
-       src = menuplyr_pixels;
-       dest = trans = qmalloc(c);
-       for (i = 0;i < c;i++)
-               *dest++ = translation[*src++];
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
 
-       rt = R_LoadTexture ("translatedplayerpic", pic->width, pic->height, trans, TEXF_ALPHA | TEXF_PRECACHE);
-       qfree(trans);
-
-       if (!r_render.value)
-               return;
-       Draw_GenericPic (rt, 1,1,1,1, x, y, pic->width, pic->height);
+       char_texture = Draw_CachePic("gfx/conchars")->tex;
 }
 
+static void gl_draw_shutdown(void)
+{
+       R_FreeTexturePool(&drawtexturepool);
 
-/*
-================
-Draw_ConsoleBackground
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
+}
 
-================
-*/
-void Draw_ConsoleBackground (int lines)
+static void gl_draw_newmap(void)
 {
-       Draw_GenericPic (conbacktex, 1,1,1,scr_conalpha.value * lines / vid.conheight, 0, lines - vid.conheight, vid.conwidth, vid.conheight);
-       // LordHavoc: draw version
-       Draw_String(engineversionx, lines - vid.conheight + engineversiony, engineversion, 9999);
 }
 
-/*
-=============
-Draw_Fill
-
-Fills a box of pixels with a single color
-=============
-*/
-void Draw_Fill (int x, int y, int w, int h, int c)
+void GL_Draw_Init (void)
 {
-       if (!r_render.value)
-               return;
-       glDisable (GL_TEXTURE_2D);
-       if (lighthalf)
-       {
-               byte *tempcolor = (byte *)&d_8to24table[c];
-               glColor4ub ((byte) (tempcolor[0] >> 1), (byte) (tempcolor[1] >> 1), (byte) (tempcolor[2] >> 1), tempcolor[3]);
-       }
-       else
-               glColor4ubv ((byte *)&d_8to24table[c]);
-
-       glBegin (GL_QUADS);
-
-       glVertex2f (x,y);
-       glVertex2f (x+w, y);
-       glVertex2f (x+w, y+h);
-       glVertex2f (x, y+h);
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
 
-       glEnd ();
-       glColor3f(1,1,1);
-       glEnable (GL_TEXTURE_2D);
+       R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
 }
-//=============================================================================
-
-//=============================================================================
 
-/*
-================
-GL_Set2D
+float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
 
-Setup as if the screen was 320*200
-================
-*/
-void GL_Set2D (void)
+int quadelements[768];
+void R_DrawQueue(void)
 {
-       if (!r_render.value)
+       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;
+       int batchcount;
+       unsigned int color;
+       drawqueuemesh_t *mesh;
+       rmeshstate_t m;
+
+       if (!r_render.integer)
                return;
-       glViewport (vid.realx, vid.realy, vid.realwidth, vid.realheight);
-
-       glMatrixMode(GL_PROJECTION);
-    glLoadIdentity ();
-       glOrtho  (0, vid.conwidth, vid.conheight, 0, -99999, 99999);
-
-       glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity ();
-
-       glDisable (GL_DEPTH_TEST);
-       glDisable (GL_CULL_FACE);
-       glEnable (GL_BLEND);
-       glDisable (GL_ALPHA_TEST);
-       glEnable(GL_TEXTURE_2D);
-
-       // LordHavoc: added this
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-       glColor3f(1,1,1);
-}
-
-// LordHavoc: SHOWLMP stuff
-#define SHOWLMP_MAXLABELS 256
-typedef struct showlmp_s
-{
-       qboolean        isactive;
-       float           x;
-       float           y;
-       char            label[32];
-       char            pic[128];
-} showlmp_t;
-
-showlmp_t showlmp[SHOWLMP_MAXLABELS];
 
-void SHOWLMP_decodehide(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)
+       if (!quadelements[1])
+       {
+               // elements for rendering a series of quads as triangles
+               for (batch = 0, pos = 0, num = 0;batch < 128;batch++, num += 4)
                {
-                       showlmp[i].isactive = false;
-                       return;
+                       quadelements[pos++] = num;
+                       quadelements[pos++] = num + 1;
+                       quadelements[pos++] = num + 2;
+                       quadelements[pos++] = num;
+                       quadelements[pos++] = num + 2;
+                       quadelements[pos++] = num + 3;
                }
-}
+       }
 
-void SHOWLMP_decodeshow(void)
-{
-       int i, k;
-       byte lmplabel[256], picname[256];
-       float x, y;
-       strcpy(lmplabel,MSG_ReadString());
-       strcpy(picname, MSG_ReadString());
-       if (gamemode == GAME_NEHAHRA) // LordHavoc: nasty old legacy junk
+       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(1, r_refdef.fov_x, 170);
+       r_view_fov_y = bound(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);
+
+       memset(&m, 0, sizeof(m));
+
+       pic = NULL;
+       texnum = 0;
+       color = 0;
+       GL_Color(1,1,1,1);
+
+       batch = false;
+       batchcount = 0;
+       for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size)
        {
-               x = MSG_ReadByte();
-               y = MSG_ReadByte();
+               dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
+               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
+                       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_STRING:
+                       GL_Color(c[0], c[1], c[2], c[3]);
+                       str = (char *)(dq + 1);
+                       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 != ' ')
+                               {
+                                       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 >= 128)
+                                       {
+                                               GL_LockArrays(0, batchcount * 4);
+                                               R_Mesh_Draw(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(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(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;                          
+               }
        }
-       else
+
+       if (!vid_usinghwgamma)
        {
-               x = MSG_ReadShort();
-               y = MSG_ReadShort();
-       }
-       k = -1;
-       for (i = 0;i < SHOWLMP_MAXLABELS;i++)
-               if (showlmp[i].isactive)
+               // 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)
                {
-                       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(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(void)
-{
-       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(3, 1, polygonelements);
+               }
+       }
 }
 
-void SHOWLMP_clear(void)
-{
-       int i;
-       for (i = 0;i < SHOWLMP_MAXLABELS;i++)
-               showlmp[i].isactive = false;
-}