]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_draw.c
video modes in menu now also set vid_pixelheight and vid_conwidth/vid_conheight
[xonotic/darkplaces.git] / gl_draw.c
index cb4cc1afd74ab215791320a87b98e05f62eb6d72..7509ea46e907ee13011d656d526cbf21cd7f0a47 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,634 +18,693 @@ 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         qsg_version = {"qsg_version", "1"};
-cvar_t         scr_conalpha = {"scr_conalpha", "1"};
-
-byte           *draw_chars;                            // 8*8 graphic characters
-qpic_t         *draw_disc;
-
-int                    char_texture;
-
-typedef struct
-{
-       int             texnum;
-       float   sl, tl, sh, th;
-} glpic_t;
-
-int                    conbacktexnum;
-
-/*
-=============================================================================
-
-  scrap allocation
-
-  Allocate all the little status bar obejcts into a single texture
-  to crutch up stupid hardware / drivers
-
-=============================================================================
-*/
-
-#define        MAX_SCRAPS              2
-#define        BLOCK_WIDTH             256
-#define        BLOCK_HEIGHT    256
-
-int                    scrap_allocated[MAX_SCRAPS][BLOCK_WIDTH];
-byte           scrap_texels[MAX_SCRAPS][BLOCK_WIDTH*BLOCK_HEIGHT*4];
-qboolean       scrap_dirty;
-
-// returns a texture number and the position inside it
-int Scrap_AllocBlock (int w, int h, int *x, int *y)
-{
-       int             i, j;
-       int             best, best2;
-       int             texnum;
-
-       for (texnum=0 ; texnum<MAX_SCRAPS ; texnum++)
-       {
-               best = BLOCK_HEIGHT;
-
-               for (i=0 ; i<BLOCK_WIDTH-w ; 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;
-                       }
-               }
+#include "cl_video.h"
 
-               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;
-}
-
-int    scrap_uploads;
-int scraptexnum[MAX_SCRAPS];
-
-void Scrap_Upload (void)
-{
-       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;
-}
+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;
-
-byte           menuplyr_pixels[4096];
+#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;
 
-int            pic_texels;
-int            pic_count;
+static rtexturepool_t *drawtexturepool;
 
-extern int GL_LoadPicTexture (qpic_t *pic);
-
-qpic_t *Draw_PicFromWad (char *name)
+static unsigned char concharimage[FONT_FILESIZE] =
 {
-       qpic_t  *p;
-       glpic_t *gl;
+#include "lhfont.h"
+};
 
-       p = W_GetLumpName (name);
-       gl = (glpic_t *)p->data;
+static rtexture_t *draw_generateconchars(void)
+{
+       int i;
+       unsigned char buffer[65536][4], *data = NULL;
+       double random;
 
-       // load little ones into the scrap
-       if (p->width < 64 && p->height < 64)
+       data = LoadTGA (concharimage, FONT_FILESIZE, 256, 256);
+// Gold numbers
+       for (i = 0;i < 8192;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;
+               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];
        }
-       else
+// White chars
+       for (i = 8192;i < 32768;i++)
        {
-               gl->texnum = GL_LoadPicTexture (p);
-               gl->sl = 0;
-               gl->sh = 1;
-               gl->tl = 0;
-               gl->th = 1;
+               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];
        }
-       return p;
-}
-
-
-/*
-================
-Draw_CachePic
-================
-*/
-qpic_t *Draw_CachePic (char *path)
-{
-       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_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 = loadtextureimage(path, 0, 0, false, false);
-       if (!gl->texnum)
-               gl->texnum = GL_LoadPicTexture (dat);
-       gl->sl = 0;
-       gl->sh = 1;
-       gl->tl = 0;
-       gl->th = 1;
-
-       return &pic->pic;
-}
-
-extern void LoadSky_f(void);
-
-/*
-===============
-Draw_Init
-===============
-*/
-void rmain_registercvars();
-extern int buildnumber;
-
-void gl_draw_start()
-{
-       int             i;
-
-       char_texture = loadtextureimage ("conchars", 0, 0, false, false);
-       if (!char_texture)
+// Gold numbers
+       for (i = 32768;i < 40960;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 = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true, 1);
+               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];
        }
 
-       conbacktexnum = loadtextureimage("gfx/conback", 0, 0, false, false);
-
-       memset(scraptexnum, 0, sizeof(scraptexnum));
+#if 0
+       Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
+#endif
 
-       // get the other pics we need
-       draw_disc = Draw_PicFromWad ("disc");
+       Mem_Free(data);
+       return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
-void gl_draw_shutdown()
+static char *pointerimage =
+       "333333332......."
+       "26777761........"
+       "2655541........."
+       "265541.........."
+       "2654561........."
+       "26414561........"
+       "251.14561......."
+       "21...14561......"
+       "1.....141......."
+       ".......1........"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+;
+
+static rtexture_t *draw_generatemousepointer(void)
 {
+       int i;
+       unsigned char buffer[256][4];
+       for (i = 0;i < 256;i++)
+       {
+               if (pointerimage[i] == '.')
+               {
+                       buffer[i][0] = 0;
+                       buffer[i][1] = 0;
+                       buffer[i][2] = 0;
+                       buffer[i][3] = 0;
+               }
+               else
+               {
+                       buffer[i][0] = (pointerimage[i] - '0') * 16;
+                       buffer[i][1] = (pointerimage[i] - '0') * 16;
+                       buffer[i][2] = (pointerimage[i] - '0') * 16;
+                       buffer[i][3] = 255;
+               }
+       }
+       return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
-char engineversion[40];
-int engineversionx, engineversiony;
+// must match NUMCROSSHAIRS in r_crosshairs.c
+#define NUMCROSSHAIRS 6
 
-extern void GL_Textures_Init();
-void GL_Draw_Init (void)
+static char *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......."
+       "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "........7......."
+       "................"
+       "........4......."
+       ".....7.4.4.7...."
+       "........4......."
+       "................"
+       "........7......."
+       "................"
+       "................"
+       "................"
+       "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       ".......55......."
+       ".......55......."
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+};
+
+static rtexture_t *draw_generatecrosshair(int num)
 {
        int i;
-       Cvar_RegisterVariable (&qsg_version);
-       Cvar_RegisterVariable (&scr_conalpha);
-
-       Cmd_AddCommand ("loadsky", &LoadSky_f);
+       char *in;
+       unsigned char data[16*16][4];
+       in = crosshairtexdata[num];
+       for (i = 0;i < 16*16;i++)
+       {
+               if (in[i] == '.')
+               {
+                       data[i][0] = 255;
+                       data[i][1] = 255;
+                       data[i][2] = 255;
+                       data[i][3] = 0;
+               }
+               else
+               {
+                       data[i][0] = 255;
+                       data[i][1] = 255;
+                       data[i][2] = 255;
+                       data[i][3] = (unsigned char) ((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);
+}
 
-#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);
+static rtexture_t *draw_generateditherpattern(void)
+{
+#if 1
+       int x, y;
+       unsigned char data[8*8*4];
+       for (y = 0;y < 8;y++)
+       {
+               for (x = 0;x < 8;x++)
+               {
+                       data[(y*8+x)*4+0] = data[(y*8+x)*4+1] = data[(y*8+x)*4+2] = ((x^y) & 4) ? 255 : 0;
+                       data[(y*8+x)*4+3] = 255;
+               }
+       }
+       return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
 #else
-       sprintf (engineversion, "DarkPlaces Unknown GL %.2f build %3i", (float) VERSION, buildnumber);
+       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
-       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);
 }
 
 /*
 ================
-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 (const char *path, qboolean persistent)
 {
-       int                             row, col;
-       float                   frow, fcol, size;
+       int i, crc, hashkey;
+       cachepic_t *pic;
+       qpic_t *p;
+       int flags;
 
-       if (num == 32)
-               return;         // space
+       if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
 
-       num &= 255;
-       
-       if (y <= -8)
-               return;                 // totally off screen
+       {
+               clvideo_t *video;
 
-       row = num>>4;
-       col = num&15;
+               video = CL_GetVideo(path);
+               if( video )
+                       return &video->cpif;
+       }
 
-       frow = row*0.0625;
-       fcol = col*0.0625;
-       size = 0.0625;
+       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;
 
-       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)
+       if (numcachepics == MAX_CACHED_PICS)
        {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+               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"))
+                       {
+                               unsigned char *pix;
+                               // conchars is a raw image and with the wrong transparent color
+                               pix = (unsigned char *)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, flags, palette_complete);
+                       }
+                       else
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
+               }
        }
 
-       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);
+       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;
 }
 
-/*
-================
-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(const char *picname, int width, int height, int alpha, unsigned char *pixels)
 {
-       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);
-
-       // LordHavoc: NEAREST mode on text if not scaling up
-       if ((int) vid.width < glwidth)
+       int crc, hashkey;
+       cachepic_t *pic;
+
+       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;
+
+       if (pic)
        {
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-               glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+               if (pic->tex && pic->width == width && pic->height == height)
+               {
+                       R_UpdateTexture(pic->tex, pixels);
+                       return pic;
+               }
        }
-
-       glColor3f(1,1,1);
-       glBegin (GL_QUADS);
-       while (maxlen-- && x < (int) vid.width) // stop rendering when out of characters or room
+       else
        {
-               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)
+                       {
+                               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;
                }
-               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);
+       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 (int texnum, float red, float green, float blue, float alpha, int x, int y, int width, int height)
+void Draw_FreePic(const char *picname)
 {
-       if (!r_render.value)
-               return;
-       glColor4f(red,green,blue,alpha);
-       glBindTexture(GL_TEXTURE_2D, texnum);
-       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 ();
+       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_AlphaPic
-=============
+===============
+Draw_Init
+===============
 */
-void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha)
+static void gl_draw_start(void)
 {
-       glpic_t                 *gl;
-
-       if (scrap_dirty)
-               Scrap_Upload ();
-       gl = (glpic_t *)pic->data;
-       if (!r_render.value)
-               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 ();
-}
+       drawtexturepool = R_AllocTexturePool();
 
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
 
-/*
-=============
-Draw_Pic
-=============
-*/
-void Draw_Pic (int x, int y, qpic_t *pic)
-{
-       glpic_t                 *gl;
-
-       if (scrap_dirty)
-               Scrap_Upload ();
-       gl = (glpic_t *)pic->data;
-       if (!r_render.value)
-               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 ();
+       char_texture = Draw_CachePic("gfx/conchars", true)->tex;
 }
 
-
-/*
-=============
-Draw_PicTranslate
-
-Only used for the player color selection menu
-=============
-*/
-void Draw_PicTranslate (int x, int y, qpic_t *pic, byte *translation)
+static void gl_draw_shutdown(void)
 {
-       int                             i, c;
-       byte                    *trans, *src, *dest;
-
-       c = pic->width * pic->height;
-       src = menuplyr_pixels;
-       dest = trans = malloc(c);
-       for (i = 0;i < c;i++)
-               *dest++ = translation[*src++];
+       R_FreeTexturePool(&drawtexturepool);
 
-       c = GL_LoadTexture ("translatedplayerpic", pic->width, pic->height, trans, false, true, 1);
-       free(trans);
-
-       if (!r_render.value)
-               return;
-       Draw_GenericPic (c, 1,1,1,1, x, y, pic->width, pic->height);
-       /*
-       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 ();
-       */
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
 }
 
-
-/*
-================
-Draw_ConsoleBackground
-
-================
-*/
-void Draw_ConsoleBackground (int lines)
+static void gl_draw_newmap(void)
 {
-       Draw_GenericPic (conbacktexnum, 1,1,1,scr_conalpha.value*lines/vid.height, 0, lines - vid.height, vid.width, vid.height);
-       // LordHavoc: draw version
-       Draw_String(engineversionx, lines - vid.height + 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);
-       glColor3f (host_basepal[c*3]/255.0, host_basepal[c*3+1]/255.0, host_basepal[c*3+2]/255.0);
+       numcachepics = 0;
+       memset(cachepichash, 0, sizeof(cachepichash));
 
-       glBegin (GL_QUADS);
-
-       glVertex2f (x,y);
-       glVertex2f (x+w, y);
-       glVertex2f (x+w, y+h);
-       glVertex2f (x, y+h);
-
-       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 (glx, gly, glwidth, glheight);
 
-       glMatrixMode(GL_PROJECTION);
-    glLoadIdentity ();
-       glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);
-
-       glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity ();
+       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;
+               }
+       }
 
-       glDisable (GL_DEPTH_TEST);
-       glDisable (GL_CULL_FACE);
-       glEnable (GL_BLEND);
-       glDisable (GL_ALPHA_TEST);
-       glEnable(GL_TEXTURE_2D);
+       r_view_width = bound(0, r_refdef.width, vid.width);
+       r_view_height = bound(0, r_refdef.height, vid.height);
+       r_view_depth = 1;
+       r_view_x = bound(0, r_refdef.x, vid.width - r_refdef.width);
+       r_view_y = bound(0, r_refdef.y, vid.height - r_refdef.height);
+       r_view_z = 0;
+       r_view_matrix = r_refdef.viewentitymatrix;
+       GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
 
-       // LordHavoc: added this
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+       qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
+       GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+       qglDepthFunc(GL_LEQUAL);
+       R_Mesh_Matrix(&r_identitymatrix);
 
-       glColor3f(1,1,1);
-}
+       chartexnum = R_GetTexture(char_texture);
 
-// 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;
+       memset(&m, 0, sizeof(m));
 
-showlmp_t showlmp[SHOWLMP_MAXLABELS];
+       pic = NULL;
+       texnum = 0;
+       color = 0;
+       GL_Color(1,1,1,1);
 
-void SHOWLMP_decodehide()
-{
-       int i;
-       byte *lmplabel;
-       lmplabel = MSG_ReadString();
-       for (i = 0;i < SHOWLMP_MAXLABELS;i++)
-               if (showlmp[i].isactive && strcmp(showlmp[i].label, lmplabel) == 0)
+       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);
+               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)
                {
-                       showlmp[i].isactive = false;
-                       return;
+               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.integer)
+                       {
+                               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(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 = (drawqueuemesh_t *)(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.width / vid_conwidth.integer);
+                               // OGL uses top to bottom
+                               y = dq->y * ((float) vid.height / vid_conheight.integer);
+                               width = dq->scalex * ((float)vid.width / vid_conwidth.integer);
+                               height = dq->scaley * ((float)vid.height / vid_conheight.integer);
+
+                               GL_Scissor(x, y, width, height);
+
+                               GL_ScissorTest(true);
+                       }
+                       break;
+               case DRAWQUEUE_RESETCLIP:
+                       GL_ScissorTest(false);
+                       break;
                }
-}
+       }
 
-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)
+       if (!vid_usinghwgamma)
+       {
+               // 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(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;
-}