]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_backend.c
fixed some dynamic lighting bugs related to glowing self
[xonotic/darkplaces.git] / gl_backend.c
index 21eafef82983246423b9158eeeea7172ca4c7525..c8ab4bef026ce66120b07b5e86a05c5a2ab03763 100644 (file)
 
 #include "quakedef.h"
+#include "image.h"
 
-static int max_meshs;
-static int max_batch;
-static int max_verts; // always max_meshs * 3
-#define TRANSDEPTHRES 4096
+cvar_t gl_mesh_maxverts = {0, "gl_mesh_maxverts", "1024"};
+cvar_t gl_mesh_floatcolors = {0, "gl_mesh_floatcolors", "1"};
+cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1"};
 
-static cvar_t gl_mesh_maxtriangles = {0, "gl_mesh_maxtriangles", "21760"};
-static cvar_t gl_mesh_batchtriangles = {0, "gl_mesh_batchtriangles", "1024"};
-static cvar_t gl_mesh_merge = {0, "gl_mesh_merge", "1"};
-static cvar_t gl_mesh_floatcolors = {0, "gl_mesh_floatcolors", "1"};
-static cvar_t gl_mesh_dupetransverts = {0, "gl_mesh_dupetransverts", "0"};
+cvar_t r_render = {0, "r_render", "1"};
+cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1"}; // whether or not to use dithering
+cvar_t gl_lockarrays = {0, "gl_lockarrays", "1"};
 
-typedef struct buf_mesh_s
+int gl_maxdrawrangeelementsvertices;
+int gl_maxdrawrangeelementsindices;
+
+#ifdef DEBUGGL
+int errornumber = 0;
+
+void GL_PrintError(int errornumber, char *filename, int linenumber)
+{
+       switch(errornumber)
+       {
+#ifdef GL_INVALID_ENUM
+       case GL_INVALID_ENUM:
+               Con_Printf("GL_INVALID_ENUM at %s:%i\n", filename, linenumber);
+               break;
+#endif
+#ifdef GL_INVALID_VALUE
+       case GL_INVALID_VALUE:
+               Con_Printf("GL_INVALID_VALUE at %s:%i\n", filename, linenumber);
+               break;
+#endif
+#ifdef GL_INVALID_OPERATION
+       case GL_INVALID_OPERATION:
+               Con_Printf("GL_INVALID_OPERATION at %s:%i\n", filename, linenumber);
+               break;
+#endif
+#ifdef GL_STACK_OVERFLOW
+       case GL_STACK_OVERFLOW:
+               Con_Printf("GL_STACK_OVERFLOW at %s:%i\n", filename, linenumber);
+               break;
+#endif
+#ifdef GL_STACK_UNDERFLOW
+       case GL_STACK_UNDERFLOW:
+               Con_Printf("GL_STACK_UNDERFLOW at %s:%i\n", filename, linenumber);
+               break;
+#endif
+#ifdef GL_OUT_OF_MEMORY
+       case GL_OUT_OF_MEMORY:
+               Con_Printf("GL_OUT_OF_MEMORY at %s:%i\n", filename, linenumber);
+               break;
+#endif
+#ifdef GL_TABLE_TOO_LARGE
+    case GL_TABLE_TOO_LARGE:
+               Con_Printf("GL_TABLE_TOO_LARGE at %s:%i\n", filename, linenumber);
+               break;
+#endif
+       default:
+               Con_Printf("GL UNKNOWN (%i) at %s:%i\n", errornumber, filename, linenumber);
+               break;
+       }
+}
+#endif
+
+#define BACKENDACTIVECHECK if (!backendactive) Sys_Error("GL backend function called when backend is not active\n");
+
+int c_meshs, c_meshelements;
+
+void SCR_ScreenShot_f (void);
+
+// these are externally accessible
+int r_lightmapscalebit;
+float r_colorscale;
+float *varray_vertex;
+float *varray_color;
+float *varray_texcoord[MAX_TEXTUREUNITS];
+int mesh_maxverts;
+
+static matrix4x4_t backend_viewmatrix;
+static matrix4x4_t backend_modelmatrix;
+static matrix4x4_t backend_modelviewmatrix;
+static matrix4x4_t backend_glmodelviewmatrix;
+
+static int backendunits, backendactive;
+static qbyte *varray_bcolor;
+static mempool_t *gl_backend_mempool;
+
+int polygonelements[768];
+
+void GL_Backend_AllocArrays(void)
+{
+       int i;
+
+       for (i = 0;i < POLYGONELEMENTS_MAXPOINTS - 2;i++)
+       {
+               polygonelements[i * 3 + 0] = 0;
+               polygonelements[i * 3 + 1] = i + 1;
+               polygonelements[i * 3 + 2] = i + 2;
+       }
+
+       if (!gl_backend_mempool)
+               gl_backend_mempool = Mem_AllocPool("GL_Backend");
+
+       varray_vertex = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(float[4]));
+       varray_color = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(float[4]));
+       varray_bcolor = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(qbyte[4]));
+       for (i = 0;i < backendunits;i++)
+               varray_texcoord[i] = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(float[4]));
+       for (;i < MAX_TEXTUREUNITS;i++)
+               varray_texcoord[i] = NULL;
+}
+
+void GL_Backend_FreeArrays(int resizingbuffers)
 {
-       struct buf_mesh_s *next;
-       int depthmask;
-       int depthtest;
-       int blendfunc1, blendfunc2;
-       int textures[MAX_TEXTUREUNITS];
-       float texturergbscale[MAX_TEXTUREUNITS];
-       int firsttriangle;
-       int triangles;
-       int firstvert;
-       int lastvert;
+       int i;
+       if (resizingbuffers)
+               Mem_EmptyPool(gl_backend_mempool);
+       else
+               Mem_FreePool(&gl_backend_mempool);
+       varray_vertex = NULL;
+       varray_color = NULL;
+       varray_bcolor = NULL;
+       for (i = 0;i < MAX_TEXTUREUNITS;i++)
+               varray_texcoord[i] = NULL;
 }
-buf_mesh_t;
 
-typedef struct buf_transtri_s
+static void gl_backend_start(void)
 {
-       struct buf_transtri_s *next;
-       buf_mesh_t *mesh;
-       int index[3];
+       Con_Printf("OpenGL Backend started with gl_mesh_maxverts %i\n", gl_mesh_maxverts.integer);
+       if (qglDrawRangeElements != NULL)
+       {
+               qglGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &gl_maxdrawrangeelementsvertices);
+               qglGetIntegerv(GL_MAX_ELEMENTS_INDICES, &gl_maxdrawrangeelementsindices);
+               CHECKGLERROR
+               Con_Printf("glDrawRangeElements detected (max vertices %i, max indices %i)\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices);
+       }
+       if (strstr(gl_renderer, "3Dfx"))
+       {
+               Con_Printf("3Dfx driver detected, forcing gl_mesh_floatcolors to 0 to prevent crashs\n");
+               Cvar_SetValueQuick(&gl_mesh_floatcolors, 0);
+       }
+
+       backendunits = min(MAX_TEXTUREUNITS, gl_textureunits);
+
+       GL_Backend_AllocArrays();
+
+       backendactive = true;
 }
-buf_transtri_t;
 
-typedef struct buf_tri_s
+static void gl_backend_shutdown(void)
 {
-       int index[3];
+       backendunits = 0;
+       backendactive = false;
+
+       Con_Printf("OpenGL Backend shutting down\n");
+
+       GL_Backend_FreeArrays(false);
 }
-buf_tri_t;
 
-typedef struct
+void GL_Backend_CheckCvars(void)
 {
-       float v[4];
+       // 21760 is (65536 / 3) rounded off to a multiple of 128
+       if (gl_mesh_maxverts.integer < 1024)
+               Cvar_SetValueQuick(&gl_mesh_maxverts, 1024);
+       if (gl_mesh_maxverts.integer > 21760)
+               Cvar_SetValueQuick(&gl_mesh_maxverts, 21760);
 }
-buf_vertex_t;
 
-typedef struct
+void GL_Backend_ResizeArrays(int numtriangles)
 {
-       float c[4];
+       Cvar_SetValueQuick(&gl_mesh_maxverts, numtriangles);
+       GL_Backend_CheckCvars();
+       mesh_maxverts = gl_mesh_maxverts.integer;
+       GL_Backend_FreeArrays(true);
+       GL_Backend_AllocArrays();
 }
-buf_fcolor_t;
 
-typedef struct
+static void gl_backend_newmap(void)
 {
-       byte c[4];
 }
-buf_bcolor_t;
 
-typedef struct
+void gl_backend_init(void)
 {
-       float t[2];
+       Cvar_RegisterVariable(&r_render);
+       Cvar_RegisterVariable(&gl_dither);
+       Cvar_RegisterVariable(&gl_lockarrays);
+#ifdef NORENDER
+       Cvar_SetValue("r_render", 0);
+#endif
+
+       Cvar_RegisterVariable(&gl_mesh_maxverts);
+       Cvar_RegisterVariable(&gl_mesh_floatcolors);
+       Cvar_RegisterVariable(&gl_mesh_drawrangeelements);
+       GL_Backend_CheckCvars();
+       R_RegisterModule("GL_Backend", gl_backend_start, gl_backend_shutdown, gl_backend_newmap);
 }
-buf_texcoord_t;
-
-static float meshfarclip;
-static int currentmesh, currenttriangle, currentvertex, backendunits, backendactive, meshmerge, floatcolors, transranout;
-static buf_mesh_t *buf_mesh;
-static buf_tri_t *buf_tri;
-static buf_vertex_t *buf_vertex;
-static buf_fcolor_t *buf_fcolor;
-static buf_bcolor_t *buf_bcolor;
-static buf_texcoord_t *buf_texcoord[MAX_TEXTUREUNITS];
-
-static int currenttransmesh, currenttransvertex, currenttranstriangle;
-static buf_mesh_t *buf_transmesh;
-static buf_transtri_t *buf_transtri;
-static buf_transtri_t **buf_transtri_list;
-static buf_vertex_t *buf_transvertex;
-static buf_fcolor_t *buf_transfcolor;
-static buf_bcolor_t *buf_transbcolor;
-static buf_texcoord_t *buf_transtexcoord[MAX_TEXTUREUNITS];
 
-static mempool_t *gl_backend_mempool;
+void GL_SetupView_ViewPort (int x, int y, int width, int height)
+{
+       if (!r_render.integer)
+               return;
 
-static void gl_backend_start(void)
+       // y is weird beause OpenGL is bottom to top, we use top to bottom
+       qglViewport(x, vid.realheight - (y + height), width, height);
+       CHECKGLERROR
+}
+
+void GL_SetupView_Orientation_Identity (void)
 {
-       int i;
+       Matrix4x4_CreateIdentity(&backend_viewmatrix);
+       memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
+}
 
-       max_verts = max_meshs * 3;
+void GL_SetupView_Orientation_FromEntity (vec3_t origin, vec3_t angles)
+{
+       Matrix4x4_CreateRotate(&backend_viewmatrix, -90, 1, 0, 0);
+       Matrix4x4_ConcatRotate(&backend_viewmatrix, 90, 0, 0, 1);
+       Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[2], 1, 0, 0);
+       Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[0], 0, 1, 0);
+       Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[1], 0, 0, 1);
+       Matrix4x4_ConcatTranslate(&backend_viewmatrix, -origin[0], -origin[1], -origin[2]);
+       memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
+}
 
-       gl_backend_mempool = Mem_AllocPool("GL_Backend");
+void GL_SetupView_Mode_Perspective (double fovx, double fovy, double zNear, double zFar)
+{
+       double xmax, ymax;
 
-#define BACKENDALLOC(var, count, sizeofstruct)\
-       {\
-               var = Mem_Alloc(gl_backend_mempool, count * sizeof(sizeofstruct));\
-               if (var == NULL)\
-                       Sys_Error("gl_backend_start: unable to allocate memory\n");\
-               memset(var, 0, count * sizeof(sizeofstruct));\
-       }
+       if (!r_render.integer)
+               return;
 
-       BACKENDALLOC(buf_mesh, max_meshs, buf_mesh_t)
-       BACKENDALLOC(buf_tri, max_meshs, buf_tri_t)
-       BACKENDALLOC(buf_vertex, max_verts, buf_vertex_t)
-       BACKENDALLOC(buf_fcolor, max_verts, buf_fcolor_t)
-       BACKENDALLOC(buf_bcolor, max_verts, buf_bcolor_t)
+       // set up viewpoint
+       qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+       qglLoadIdentity ();CHECKGLERROR
+       // pyramid slopes
+       xmax = zNear * tan(fovx * M_PI / 360.0);
+       ymax = zNear * tan(fovy * M_PI / 360.0);
+       // set view pyramid
+       qglFrustum(-xmax, xmax, -ymax, ymax, zNear, zFar);CHECKGLERROR
+       qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+       GL_SetupView_Orientation_Identity();
+}
 
-       BACKENDALLOC(buf_transmesh, max_meshs, buf_mesh_t)
-       BACKENDALLOC(buf_transtri, max_meshs, buf_transtri_t)
-       BACKENDALLOC(buf_transtri_list, TRANSDEPTHRES, buf_transtri_t *)
-       BACKENDALLOC(buf_transvertex, max_verts, buf_vertex_t)
-       BACKENDALLOC(buf_transfcolor, max_verts, buf_fcolor_t)
-       BACKENDALLOC(buf_transbcolor, max_verts, buf_bcolor_t)
+void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double fovx, double fovy, double zNear)
+{
+       double nudge, m[16];
 
-       for (i = 0;i < MAX_TEXTUREUNITS;i++)
+       if (!r_render.integer)
+               return;
+
+       // set up viewpoint
+       qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+       qglLoadIdentity ();CHECKGLERROR
+       // set view pyramid
+       nudge = 1.0 - 1.0 / (1<<23);
+       m[ 0] = 1.0 / tan(fovx * M_PI / 360.0);
+       m[ 1] = 0;
+       m[ 2] = 0;
+       m[ 3] = 0;
+       m[ 4] = 0;
+       m[ 5] = 1.0 / tan(fovy * M_PI / 360.0);
+       m[ 6] = 0;
+       m[ 7] = 0;
+       m[ 8] = 0;
+       m[ 9] = 0;
+       m[10] = -1 * nudge;
+       m[11] = -1 * nudge;
+       m[12] = 0;
+       m[13] = 0;
+       m[14] = -2 * zNear * nudge;
+       m[15] = 0;
+       qglLoadMatrixd(m);
+       qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+       GL_SetupView_Orientation_Identity();
+}
+
+void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double zNear, double zFar)
+{
+       if (!r_render.integer)
+               return;
+
+       // set up viewpoint
+       qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+       qglLoadIdentity ();CHECKGLERROR
+       qglOrtho(x1, x2, y2, y1, zNear, zFar);
+       qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+       GL_SetupView_Orientation_Identity();
+}
+
+typedef struct gltextureunit_s
+{
+       unsigned int t1d, t2d, t3d, tcubemap;
+       unsigned int arrayenabled;
+       float rgbscale, alphascale;
+       int combinergb, combinealpha;
+       // FIXME: add more combine stuff
+}
+gltextureunit_t;
+
+static struct
+{
+       int blendfunc1;
+       int blendfunc2;
+       int blend;
+       GLboolean depthmask;
+       int depthdisable;
+       int unit;
+       int clientunit;
+       gltextureunit_t units[MAX_TEXTUREUNITS];
+       int colorarray;
+}
+gl_state;
+
+void GL_SetupTextureState(void)
+{
+       int i;
+       gltextureunit_t *unit;
+       for (i = 0;i < backendunits;i++)
        {
-               // only allocate as many texcoord arrays as we need
-               if (i < gl_textureunits)
+               if (qglActiveTexture)
+                       qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR
+               if (qglClientActiveTexture)
+                       qglClientActiveTexture(GL_TEXTURE0_ARB + (gl_state.clientunit = i));CHECKGLERROR
+               unit = gl_state.units + i;
+               unit->t1d = 0;
+               unit->t2d = 0;
+               unit->t3d = 0;
+               unit->tcubemap = 0;
+               unit->rgbscale = 1;
+               unit->alphascale = 1;
+               unit->combinergb = GL_MODULATE;
+               unit->combinealpha = GL_MODULATE;
+               unit->arrayenabled = false;
+               qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
+               if (gl_texture3d)
+               {
+                       qglTexCoordPointer(3, GL_FLOAT, sizeof(float[4]), varray_texcoord[i]);CHECKGLERROR
+               }
+               else
+               {
+                       qglTexCoordPointer(2, GL_FLOAT, sizeof(float[4]), varray_texcoord[i]);CHECKGLERROR
+               }
+               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
+               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
+               if (gl_texture3d)
+               {
+                       qglDisable(GL_TEXTURE_3D);CHECKGLERROR
+               }
+               if (gl_texturecubemap)
                {
-                       BACKENDALLOC(buf_texcoord[i], max_verts, buf_texcoord_t)
-                       BACKENDALLOC(buf_transtexcoord[i], max_verts, buf_texcoord_t)
+                       qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+               }
+               if (gl_combine.integer)
+               {
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_CONSTANT_ARB);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB, GL_SRC_COLOR);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_ARB, GL_SRC_COLOR);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB_ARB, GL_SRC_ALPHA);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB, GL_PREVIOUS_ARB);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA_ARB, GL_CONSTANT_ARB);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR
                }
                else
                {
-                       buf_texcoord[i] = NULL;
-                       buf_transtexcoord[i] = NULL;
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR
                }
        }
-       backendunits = min(MAX_TEXTUREUNITS, gl_textureunits);
-       backendactive = true;
 }
 
-static void gl_backend_shutdown(void)
+void GL_Backend_ResetState(void)
 {
-       int i;
-       /*
-#define BACKENDFREE(var)\
-       if (var)\
-       {\
-               Mem_Free(var);\
-               var = NULL;\
+       memset(&gl_state, 0, sizeof(gl_state));
+       gl_state.depthdisable = false;
+       gl_state.blendfunc1 = GL_ONE;
+       gl_state.blendfunc2 = GL_ZERO;
+       gl_state.blend = false;
+       gl_state.depthmask = GL_TRUE;
+       gl_state.colorarray = false;
+
+       qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
+       qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
+
+       qglEnable(GL_CULL_FACE);CHECKGLERROR
+       qglCullFace(GL_FRONT);CHECKGLERROR
+       qglEnable(GL_DEPTH_TEST);CHECKGLERROR
+       qglBlendFunc(gl_state.blendfunc1, gl_state.blendfunc2);CHECKGLERROR
+       qglDisable(GL_BLEND);CHECKGLERROR
+       qglDepthMask(gl_state.depthmask);CHECKGLERROR
+       qglVertexPointer(3, GL_FLOAT, sizeof(float[4]), varray_vertex);CHECKGLERROR
+       qglEnableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
+       if (gl_mesh_floatcolors.integer)
+       {
+               qglColorPointer(4, GL_FLOAT, sizeof(float[4]), varray_color);CHECKGLERROR
        }
-       */
-#define BACKENDFREE(var) var = NULL;
-
-       BACKENDFREE(buf_mesh)
-       BACKENDFREE(buf_tri)
-       BACKENDFREE(buf_vertex)
-       BACKENDFREE(buf_fcolor)
-       BACKENDFREE(buf_bcolor)
-
-       BACKENDFREE(buf_transmesh)
-       BACKENDFREE(buf_transtri)
-       BACKENDFREE(buf_transtri_list)
-       BACKENDFREE(buf_transvertex)
-       BACKENDFREE(buf_transfcolor)
-       BACKENDFREE(buf_transbcolor)
-
-       for (i = 0;i < MAX_TEXTUREUNITS;i++)
+       else
        {
-               BACKENDFREE(buf_texcoord[i])
-               BACKENDFREE(buf_transtexcoord[i])
+               qglColorPointer(4, GL_UNSIGNED_BYTE, sizeof(qbyte[4]), varray_bcolor);CHECKGLERROR
        }
+       GL_Color(1, 1, 1, 1);
 
-       Mem_FreePool(&gl_backend_mempool);
-
-       backendunits = 0;
-       backendactive = false;
+       GL_SetupTextureState();
 }
 
-static void gl_backend_bufferchanges(int init)
+void GL_UseColorArray(void)
 {
-       // 21760 is (65536 / 3) rounded off to a multiple of 128
-       if (gl_mesh_maxtriangles.integer < 256)
-               Cvar_SetValue("gl_mesh_maxtriangles", 256);
-       if (gl_mesh_maxtriangles.integer > 21760)
-               Cvar_SetValue("gl_mesh_maxtriangles", 21760);
-
-       if (gl_mesh_batchtriangles.integer < 0)
-               Cvar_SetValue("gl_mesh_batchtriangles", 0);
-       if (gl_mesh_batchtriangles.integer > gl_mesh_maxtriangles.integer)
-               Cvar_SetValue("gl_mesh_batchtriangles", gl_mesh_maxtriangles.integer);
-
-       max_batch = gl_mesh_batchtriangles.integer;
-
-       if (max_meshs != gl_mesh_maxtriangles.integer)
+       if (!gl_state.colorarray)
        {
-               max_meshs = gl_mesh_maxtriangles.integer;
-
-               if (!init)
-               {
-                       gl_backend_shutdown();
-                       gl_backend_start();
-               }
+               gl_state.colorarray = true;
+               qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR
        }
 }
 
-float r_farclip, r_newfarclip;
+void GL_Color(float cr, float cg, float cb, float ca)
+{
+       if (gl_state.colorarray)
+       {
+               gl_state.colorarray = false;
+               qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
+       }
+       qglColor4f(cr, cg, cb, ca);
+}
 
-static void gl_backend_newmap(void)
+// called at beginning of frame
+void R_Mesh_Start(void)
 {
-       r_farclip = r_newfarclip = 2048.0f;
+       BACKENDACTIVECHECK
+
+       CHECKGLERROR
+
+       GL_Backend_CheckCvars();
+       if (mesh_maxverts != gl_mesh_maxverts.integer)
+               GL_Backend_ResizeArrays(gl_mesh_maxverts.integer);
+
+       GL_Backend_ResetState();
 }
 
-int polyindexarray[768];
+int gl_backend_rebindtextures;
 
-void gl_backend_init(void)
+void GL_ConvertColorsFloatToByte(int numverts)
 {
-       int i;
-       Cvar_RegisterVariable(&gl_mesh_maxtriangles);
-       Cvar_RegisterVariable(&gl_mesh_batchtriangles);
-       Cvar_RegisterVariable(&gl_mesh_merge);
-       Cvar_RegisterVariable(&gl_mesh_floatcolors);
-       Cvar_RegisterVariable(&gl_mesh_dupetransverts);
-       R_RegisterModule("GL_Backend", gl_backend_start, gl_backend_shutdown, gl_backend_newmap);
-       gl_backend_bufferchanges(true);
-       for (i = 0;i < 256;i++)
+       int i, k, total;
+       // LordHavoc: to avoid problems with aliasing (treating memory as two
+       // different types - exactly what this is doing), these must be volatile
+       // (or a union)
+       volatile int *icolor;
+       volatile float *fcolor;
+       qbyte *bcolor;
+
+       total = numverts * 4;
+
+       // shift float to have 8bit fraction at base of number
+       fcolor = varray_color;
+       for (i = 0;i < total;)
        {
-               polyindexarray[i*3+0] = 0;
-               polyindexarray[i*3+1] = i + 1;
-               polyindexarray[i*3+2] = i + 2;
+               fcolor[i    ] += 32768.0f;
+               fcolor[i + 1] += 32768.0f;
+               fcolor[i + 2] += 32768.0f;
+               fcolor[i + 3] += 32768.0f;
+               i += 4;
        }
-}
-
-static float viewdist;
 
-int c_meshtris;
+       // then read as integer and kill float bits...
+       icolor = (int *)varray_color;
+       bcolor = varray_bcolor;
+       for (i = 0;i < total;)
+       {
+               k = icolor[i    ] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i    ] = (qbyte) k;
+               k = icolor[i + 1] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i + 1] = (qbyte) k;
+               k = icolor[i + 2] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i + 2] = (qbyte) k;
+               k = icolor[i + 3] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i + 3] = (qbyte) k;
+               i += 4;
+       }
+}
 
-// called at beginning of frame
-void R_Mesh_Clear(void)
+void GL_DrawRangeElements(int firstvert, int endvert, int indexcount, const int *index)
 {
-       if (!backendactive)
-               Sys_Error("R_Mesh_Clear: called when backend is not active\n");
-
-       gl_backend_bufferchanges(false);
-
-       currentmesh = 0;
-       currenttriangle = 0;
-       currentvertex = 0;
-       currenttransmesh = 0;
-       currenttranstriangle = 0;
-       currenttransvertex = 0;
-       meshfarclip = 0;
-       meshmerge = gl_mesh_merge.integer;
-       floatcolors = gl_mesh_floatcolors.integer;
-       transranout = false;
-       viewdist = DotProduct(r_origin, vpn);
-
-       c_meshtris = 0;
+       int arraylocked = false;
+       c_meshs++;
+       c_meshelements += indexcount;
+       if (indexcount == 0 || endvert == firstvert)
+       {
+               Con_Printf("GL_DrawRangeElements(%d, %d, %d, %08p);\n", firstvert, endvert, indexcount, index);
+               return;
+       }
+       if (gl_supportslockarrays && gl_lockarrays.integer)
+       {
+               qglLockArraysEXT(firstvert, endvert - firstvert);
+               CHECKGLERROR
+               arraylocked = true;
+       }
+       if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+               qglDrawRangeElements(GL_TRIANGLES, firstvert, endvert, indexcount, GL_UNSIGNED_INT, (const GLuint *) index);
+       else
+               qglDrawElements(GL_TRIANGLES, indexcount, GL_UNSIGNED_INT, (const GLuint *) index);
+       CHECKGLERROR
+       if (arraylocked)
+       {
+               qglUnlockArraysEXT();
+               CHECKGLERROR
+               arraylocked = false;
+       }
 }
 
-#ifdef DEBUGGL
-void GL_PrintError(int errornumber, char *filename, int linenumber)
+// enlarges geometry buffers if they are too small
+void _R_Mesh_ResizeCheck(int numverts)
 {
-       switch(errornumber)
+       if (numverts > mesh_maxverts)
        {
-       case GL_INVALID_ENUM:
-               Con_Printf("GL_INVALID_ENUM at %s:%i\n", filename, linenumber);
-               break;
-       case GL_INVALID_VALUE:
-               Con_Printf("GL_INVALID_VALUE at %s:%i\n", filename, linenumber);
-               break;
-       case GL_INVALID_OPERATION:
-               Con_Printf("GL_INVALID_OPERATION at %s:%i\n", filename, linenumber);
-               break;
-       case GL_STACK_OVERFLOW:
-               Con_Printf("GL_STACK_OVERFLOW at %s:%i\n", filename, linenumber);
-               break;
-       case GL_STACK_UNDERFLOW:
-               Con_Printf("GL_STACK_UNDERFLOW at %s:%i\n", filename, linenumber);
-               break;
-       case GL_OUT_OF_MEMORY:
-               Con_Printf("GL_OUT_OF_MEMORY at %s:%i\n", filename, linenumber);
-               break;
-#ifdef GL_TABLE_TOO_LARGE
-    case GL_TABLE_TOO_LARGE:
-               Con_Printf("GL_TABLE_TOO_LARGE at %s:%i\n", filename, linenumber);
-               break;
-#endif
-       default:
-               Con_Printf("GL UNKNOWN (%i) at %s:%i\n", errornumber, filename, linenumber);
-               break;
+               BACKENDACTIVECHECK
+               GL_Backend_ResizeArrays(numverts + 100);
+               GL_Backend_ResetState();
        }
 }
 
-int errornumber = 0;
-#endif
-
-// renders mesh buffers, called to flush buffers when full
-void R_Mesh_Render(void)
+// renders the mesh
+void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
 {
-       int i, k, blendfunc1, blendfunc2, blend, depthmask, depthtest, unit = 0, clientunit = 0, firsttriangle, triangles, firstvert, lastvert, texture[MAX_TEXTUREUNITS];
-       float farclip, texturergbscale[MAX_TEXTUREUNITS];
-       buf_mesh_t *mesh;
-       if (!backendactive)
-               Sys_Error("R_Mesh_Render: called when backend is not active\n");
-       if (!currentmesh)
+       BACKENDACTIVECHECK
+
+       CHECKGLERROR
+
+       if (gl_state.colorarray && !gl_mesh_floatcolors.integer)
+               GL_ConvertColorsFloatToByte(numverts);
+       if (!r_render.integer)
                return;
+       GL_DrawRangeElements(0, numverts, numtriangles * 3, elements);
+}
 
-CHECKGLERROR
+// restores backend state, used when done with 3D rendering
+void R_Mesh_Finish(void)
+{
+       int i;
+       BACKENDACTIVECHECK
 
-       // push out farclip based on vertices
-       for (i = 0;i < currentvertex;i++)
+       for (i = backendunits - 1;i >= 0;i--)
        {
-               farclip = DotProduct(buf_vertex[i].v, vpn);
-               if (meshfarclip < farclip)
-                       meshfarclip = farclip;
+               if (qglActiveTexture)
+                       qglActiveTexture(GL_TEXTURE0_ARB + i);CHECKGLERROR
+               if (qglClientActiveTexture)
+                       qglClientActiveTexture(GL_TEXTURE0_ARB + i);CHECKGLERROR
+               qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
+               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
+               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
+               if (gl_texture3d)
+               {
+                       qglDisable(GL_TEXTURE_3D);CHECKGLERROR
+               }
+               if (gl_texturecubemap)
+               {
+                       qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+               }
+               qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR
+               if (gl_combine.integer)
+               {
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR
+               }
        }
+       qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
+       qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
 
-       farclip = meshfarclip + 256.0f - viewdist; // + 256 just to be safe
-
-       // push out farclip for next frame
-       if (farclip > r_newfarclip)
-               r_newfarclip = ceil((farclip + 255) / 256) * 256 + 256;
+       qglDisable(GL_BLEND);CHECKGLERROR
+       qglEnable(GL_DEPTH_TEST);CHECKGLERROR
+       qglDepthMask(GL_TRUE);CHECKGLERROR
+       qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);CHECKGLERROR
+}
 
-       for (i = 0;i < backendunits;i++)
-               texturergbscale[i] = 1;
-
-       glEnable(GL_CULL_FACE);
-CHECKGLERROR
-       glCullFace(GL_FRONT);
-CHECKGLERROR
-       depthtest = true;
-       glEnable(GL_DEPTH_TEST);
-CHECKGLERROR
-       blendfunc1 = GL_ONE;
-       blendfunc2 = GL_ZERO;
-       glBlendFunc(blendfunc1, blendfunc2);
-CHECKGLERROR
-       blend = 0;
-       glDisable(GL_BLEND);
-CHECKGLERROR
-       depthmask = true;
-       glDepthMask((GLboolean) depthmask);
-CHECKGLERROR
-
-       glVertexPointer(3, GL_FLOAT, sizeof(buf_vertex_t), buf_vertex);
-CHECKGLERROR
-       glEnableClientState(GL_VERTEX_ARRAY);
-CHECKGLERROR
-       if (floatcolors)
-       {
-               glColorPointer(4, GL_FLOAT, sizeof(buf_fcolor_t), buf_fcolor);
-CHECKGLERROR
-       }
-       else
+void R_Mesh_Matrix(const matrix4x4_t *matrix)
+{
+       if (memcmp(matrix, &backend_modelmatrix, sizeof(matrix4x4_t)))
        {
-               glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(buf_bcolor_t), buf_bcolor);
-CHECKGLERROR
+               backend_modelmatrix = *matrix;
+               Matrix4x4_Concat(&backend_modelviewmatrix, &backend_viewmatrix, matrix);
+               Matrix4x4_Transpose(&backend_glmodelviewmatrix, &backend_modelviewmatrix);
+               qglLoadMatrixf(&backend_glmodelviewmatrix.m[0][0]);
        }
-       glEnableClientState(GL_COLOR_ARRAY);
-CHECKGLERROR
+}
+
+// sets up the requested state
+void R_Mesh_MainState(const rmeshstate_t *m)
+{
+       BACKENDACTIVECHECK
 
-       if (backendunits > 1)
+       if (gl_state.blendfunc1 != m->blendfunc1 || gl_state.blendfunc2 != m->blendfunc2)
        {
-               for (i = 0;i < backendunits;i++)
+               qglBlendFunc(gl_state.blendfunc1 = m->blendfunc1, gl_state.blendfunc2 = m->blendfunc2);CHECKGLERROR
+               if (gl_state.blendfunc2 == GL_ZERO)
                {
-                       qglActiveTexture(GL_TEXTURE0_ARB + (unit = i));
-CHECKGLERROR
-                       glBindTexture(GL_TEXTURE_2D, (texture[i] = 0));
-CHECKGLERROR
-                       glDisable(GL_TEXTURE_2D);
-CHECKGLERROR
-                       if (gl_combine.integer)
+                       if (gl_state.blendfunc1 == GL_ONE)
                        {
-                               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_CONSTANT_ARB);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB, GL_SRC_COLOR);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_ARB, GL_SRC_COLOR);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB_ARB, GL_SRC_ALPHA);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB, GL_PREVIOUS_ARB);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA_ARB, GL_CONSTANT_ARB);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB, GL_SRC_ALPHA);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB, GL_SRC_ALPHA);
-CHECKGLERROR
-                               glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA_ARB, GL_SRC_ALPHA);
-CHECKGLERROR
-                               glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1.0f);
-CHECKGLERROR
-                               glTexEnvf(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1.0f);
-CHECKGLERROR
+                               if (gl_state.blend)
+                               {
+                                       gl_state.blend = 0;
+                                       qglDisable(GL_BLEND);CHECKGLERROR
+                               }
                        }
                        else
                        {
-                               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-CHECKGLERROR
+                               if (!gl_state.blend)
+                               {
+                                       gl_state.blend = 1;
+                                       qglEnable(GL_BLEND);CHECKGLERROR
+                               }
+                       }
+               }
+               else
+               {
+                       if (!gl_state.blend)
+                       {
+                               gl_state.blend = 1;
+                               qglEnable(GL_BLEND);CHECKGLERROR
                        }
-
-                       qglClientActiveTexture(GL_TEXTURE0_ARB + (clientunit = i));
-CHECKGLERROR
-                       glTexCoordPointer(2, GL_FLOAT, sizeof(buf_texcoord_t), buf_texcoord[i]);
-CHECKGLERROR
-                       glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
                }
        }
-       else
+       if (gl_state.depthdisable != m->depthdisable)
+       {
+               gl_state.depthdisable = m->depthdisable;
+               if (gl_state.depthdisable)
+                       qglDisable(GL_DEPTH_TEST);
+               else
+                       qglEnable(GL_DEPTH_TEST);
+       }
+       if (gl_state.depthmask != (m->blendfunc2 == GL_ZERO || m->depthwrite))
        {
-               glBindTexture(GL_TEXTURE_2D, (texture[0] = 0));
-CHECKGLERROR
-               glDisable(GL_TEXTURE_2D);
-CHECKGLERROR
-               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-CHECKGLERROR
-
-               glTexCoordPointer(2, GL_FLOAT, sizeof(buf_texcoord_t), buf_texcoord[0]);
-CHECKGLERROR
-               glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
+               qglDepthMask(gl_state.depthmask = (m->blendfunc2 == GL_ZERO || m->depthwrite));CHECKGLERROR
        }
+}
+
+void R_Mesh_TextureState(const rmeshstate_t *m)
+{
+       int i, combinergb, combinealpha;
+       float scale;
+       gltextureunit_t *unit;
 
-       // lock as early as possible
-       GL_LockArray(0, currentvertex);
-CHECKGLERROR
+       BACKENDACTIVECHECK
 
-       for (k = 0;k < currentmesh;)
+       if (gl_backend_rebindtextures)
        {
-               mesh = &buf_mesh[k];
+               gl_backend_rebindtextures = false;
+               GL_SetupTextureState();
+       }
 
-               if (backendunits > 1)
+       for (i = 0;i < backendunits;i++)
+       {
+               unit = gl_state.units + i;
+               if (unit->t1d != m->tex1d[i] || unit->t2d != m->tex[i] || unit->t3d != m->tex3d[i] || unit->tcubemap != m->texcubemap[i])
                {
-//                     int topunit = 0;
-                       for (i = 0;i < backendunits;i++)
+                       if (gl_state.unit != i)
                        {
-                               if (texture[i] != mesh->textures[i])
+                               qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR
+                       }
+                       if (m->tex1d[i] || m->tex[i] || m->tex3d[i] || m->texcubemap[i])
+                       {
+                               if (!unit->arrayenabled)
                                {
-                                       if (unit != i)
-                                       {
-                                               qglActiveTexture(GL_TEXTURE0_ARB + (unit = i));
-CHECKGLERROR
-                                       }
-                                       if (texture[i] == 0)
+                                       unit->arrayenabled = true;
+                                       if (gl_state.clientunit != i)
                                        {
-                                               glEnable(GL_TEXTURE_2D);
-CHECKGLERROR
-                                               // have to disable texcoord array on disabled texture
-                                               // units due to NVIDIA driver bug with
-                                               // compiled_vertex_array
-                                               if (clientunit != i)
-                                               {
-                                                       qglClientActiveTexture(GL_TEXTURE0_ARB + (clientunit = i));
-CHECKGLERROR
-                                               }
-                                               glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
-                                       }
-                                       glBindTexture(GL_TEXTURE_2D, (texture[i] = mesh->textures[i]));
-CHECKGLERROR
-                                       if (texture[i] == 0)
-                                       {
-                                               glDisable(GL_TEXTURE_2D);
-CHECKGLERROR
-                                               // have to disable texcoord array on disabled texture
-                                               // units due to NVIDIA driver bug with
-                                               // compiled_vertex_array
-                                               if (clientunit != i)
-                                               {
-                                                       qglClientActiveTexture(GL_TEXTURE0_ARB + (clientunit = i));
-CHECKGLERROR
-                                               }
-                                               glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
+                                               qglClientActiveTexture(GL_TEXTURE0_ARB + (gl_state.clientunit = i));CHECKGLERROR
                                        }
+                                       qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
                                }
-                               if (texturergbscale[i] != mesh->texturergbscale[i])
+                       }
+                       else
+                       {
+                               if (unit->arrayenabled)
                                {
-                                       if (unit != i)
+                                       unit->arrayenabled = false;
+                                       if (gl_state.clientunit != i)
                                        {
-                                               qglActiveTexture(GL_TEXTURE0_ARB + (unit = i));
-CHECKGLERROR
+                                               qglClientActiveTexture(GL_TEXTURE0_ARB + (gl_state.clientunit = i));CHECKGLERROR
                                        }
-                                       glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (texturergbscale[i] = mesh->texturergbscale[i]));
-CHECKGLERROR
+                                       qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
                                }
-//                             if (texture[i])
-//                                     topunit = i;
                        }
-//                     if (unit != topunit)
-//                     {
-//                             qglActiveTexture(GL_TEXTURE0_ARB + (unit = topunit));
-//CHECKGLERROR
-//                     }
-               }
-               else
-               {
-                       if (texture[0] != mesh->textures[0])
+                       combinergb = m->texcombinergb[i];
+                       combinealpha = m->texcombinealpha[i];
+                       if (!combinergb)
+                               combinergb = GL_MODULATE;
+                       if (!combinealpha)
+                               combinealpha = GL_MODULATE;
+                       if (unit->combinergb != combinergb)
                        {
-                               if (texture[0] == 0)
+                               unit->combinergb = combinergb;
+                               if (gl_combine.integer)
                                {
-                                       glEnable(GL_TEXTURE_2D);
-CHECKGLERROR
-                                       glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
+                                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR
                                }
-                               glBindTexture(GL_TEXTURE_2D, (texture[0] = mesh->textures[0]));
-CHECKGLERROR
-                               if (texture[0] == 0)
+                               else
                                {
-                                       glDisable(GL_TEXTURE_2D);
-CHECKGLERROR
-                                       glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
+                                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR
                                }
                        }
-               }
-               if (blendfunc1 != mesh->blendfunc1 || blendfunc2 != mesh->blendfunc2)
-               {
-                       blendfunc1 = mesh->blendfunc1;
-                       blendfunc2 = mesh->blendfunc2;
-                       glBlendFunc(blendfunc1, blendfunc2);
-CHECKGLERROR
-                       if (blendfunc2 == GL_ZERO)
+                       if (unit->combinealpha != combinealpha)
                        {
-                               if (blendfunc1 == GL_ONE)
+                               unit->combinealpha = combinealpha;
+                               if (gl_combine.integer)
                                {
-                                       if (blend)
-                                       {
-                                               blend = 0;
-                                               glDisable(GL_BLEND);
-CHECKGLERROR
-                                       }
+                                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR
+                               }
+                       }
+                       if (unit->t1d != m->tex1d[i])
+                       {
+                               if (m->tex1d[i])
+                               {
+                                       if (unit->t1d == 0)
+                                               qglEnable(GL_TEXTURE_1D);CHECKGLERROR
                                }
                                else
                                {
-                                       if (!blend)
-                                       {
-                                               blend = 1;
-                                               glEnable(GL_BLEND);
-CHECKGLERROR
-                                       }
+                                       if (unit->t1d)
+                                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
                                }
+                               qglBindTexture(GL_TEXTURE_1D, (unit->t1d = m->tex1d[i]));CHECKGLERROR
                        }
-                       else
+                       if (unit->t2d != m->tex[i])
                        {
-                               if (!blend)
+                               if (m->tex[i])
                                {
-                                       blend = 1;
-                                       glEnable(GL_BLEND);
-CHECKGLERROR
+                                       if (unit->t2d == 0)
+                                               qglEnable(GL_TEXTURE_2D);CHECKGLERROR
                                }
+                               else
+                               {
+                                       if (unit->t2d)
+                                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
+                               }
+                               qglBindTexture(GL_TEXTURE_2D, (unit->t2d = m->tex[i]));CHECKGLERROR
                        }
-               }
-               if (depthtest != mesh->depthtest)
-               {
-                       depthtest = mesh->depthtest;
-                       if (depthtest)
-                               glEnable(GL_DEPTH_TEST);
-                       else
-                               glDisable(GL_DEPTH_TEST);
-               }
-               if (depthmask != mesh->depthmask)
-               {
-                       depthmask = mesh->depthmask;
-                       glDepthMask((GLboolean) depthmask);
-CHECKGLERROR
-               }
-
-               firsttriangle = mesh->firsttriangle;
-               triangles = mesh->triangles;
-               firstvert = mesh->firstvert;
-               lastvert = mesh->lastvert;
-               mesh = &buf_mesh[++k];
-
-               if (meshmerge)
-               {
-                       #if MAX_TEXTUREUNITS != 4
-                       #error update this code
-                       #endif
-                       while (k < currentmesh
-                               && mesh->blendfunc1 == blendfunc1
-                               && mesh->blendfunc2 == blendfunc2
-                               && mesh->depthtest == depthtest
-                               && mesh->depthmask == depthmask
-                               && mesh->textures[0] == texture[0]
-                               && mesh->textures[1] == texture[1]
-                               && mesh->textures[2] == texture[2]
-                               && mesh->textures[3] == texture[3]
-                               && mesh->texturergbscale[0] == texturergbscale[0]
-                               && mesh->texturergbscale[1] == texturergbscale[1]
-                               && mesh->texturergbscale[2] == texturergbscale[2]
-                               && mesh->texturergbscale[3] == texturergbscale[3])
-                       {
-                               triangles += mesh->triangles;
-                               if (firstvert > mesh->firstvert)
-                                       firstvert = mesh->firstvert;
-                               if (lastvert < mesh->lastvert)
-                                       lastvert = mesh->lastvert;
-                               mesh = &buf_mesh[++k];
-                       }
-               }
-
-#ifdef WIN32
-               // FIXME: dynamic link to GL so we can get DrawRangeElements on WIN32
-               glDrawElements(GL_TRIANGLES, triangles * 3, GL_UNSIGNED_INT, (unsigned int *)&buf_tri[firsttriangle]);
-#else
-               glDrawRangeElements(GL_TRIANGLES, firstvert, lastvert + 1, triangles * 3, GL_UNSIGNED_INT, (unsigned int *)&buf_tri[firsttriangle]);
-#endif
-CHECKGLERROR
-       }
-
-       currentmesh = 0;
-       currenttriangle = 0;
-       currentvertex = 0;
-
-       GL_UnlockArray();
-CHECKGLERROR
-
-       if (backendunits > 1)
-       {
-               for (i = backendunits - 1;i >= 0;i--)
-               {
-                       qglActiveTexture(GL_TEXTURE0_ARB + (unit = i));
-CHECKGLERROR
-                       glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-CHECKGLERROR
-                       if (gl_combine.integer)
-                       {
-                               glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1.0f);
-CHECKGLERROR
-                       }
-                       if (i > 0)
-                       {
-                               glDisable(GL_TEXTURE_2D);
-CHECKGLERROR
-                       }
-                       else
+                       if (unit->t3d != m->tex3d[i])
                        {
-                               glEnable(GL_TEXTURE_2D);
-CHECKGLERROR
+                               if (m->tex3d[i])
+                               {
+                                       if (unit->t3d == 0)
+                                               qglEnable(GL_TEXTURE_3D);CHECKGLERROR
+                               }
+                               else
+                               {
+                                       if (unit->t3d)
+                                               qglDisable(GL_TEXTURE_3D);CHECKGLERROR
+                               }
+                               qglBindTexture(GL_TEXTURE_3D, (unit->t3d = m->tex3d[i]));CHECKGLERROR
                        }
-                       glBindTexture(GL_TEXTURE_2D, 0);
-CHECKGLERROR
-
-                       qglClientActiveTexture(GL_TEXTURE0_ARB + (clientunit = i));
-CHECKGLERROR
-                       glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
-               }
-       }
-       else
-       {
-               glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-CHECKGLERROR
-               glEnable(GL_TEXTURE_2D);
-CHECKGLERROR
-               glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-CHECKGLERROR
-       }
-       glDisableClientState(GL_COLOR_ARRAY);
-CHECKGLERROR
-       glDisableClientState(GL_VERTEX_ARRAY);
-CHECKGLERROR
-
-       glDisable(GL_BLEND);
-CHECKGLERROR
-       glEnable(GL_DEPTH_TEST);
-CHECKGLERROR
-       glDepthMask(true);
-CHECKGLERROR
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-CHECKGLERROR
-}
-
-void R_Mesh_AddTransparent(void)
-{
-       if (gl_mesh_dupetransverts.integer)
-       {
-               int i, j, k, index;
-               float viewdistcompare, centerscaler, dist1, dist2, dist3, center, maxdist;
-               buf_vertex_t *vert1, *vert2, *vert3;
-               buf_transtri_t *tri;
-               buf_mesh_t *mesh;
-
-               // process and add transparent mesh triangles
-               if (!currenttranstriangle)
-                       return;
-
-               // map farclip to 0-4095 list range
-               centerscaler = (TRANSDEPTHRES / r_farclip) * (1.0f / 3.0f);
-               viewdistcompare = viewdist + 4.0f;
-
-               memset(buf_transtri_list, 0, TRANSDEPTHRES * sizeof(buf_transtri_t *));
-
-               // process in reverse because transtri_list adding code is in reverse as well
-               k = 0;
-               for (j = currenttranstriangle - 1;j >= 0;j--)
-               {
-                       tri = &buf_transtri[j];
-
-                       vert1 = &buf_transvertex[tri->index[0]];
-                       vert2 = &buf_transvertex[tri->index[1]];
-                       vert3 = &buf_transvertex[tri->index[2]];
-
-                       dist1 = DotProduct(vert1->v, vpn);
-                       dist2 = DotProduct(vert2->v, vpn);
-                       dist3 = DotProduct(vert3->v, vpn);
-
-                       maxdist = max(dist1, max(dist2, dist3));
-                       if (maxdist < viewdistcompare)
-                               continue;
-
-                       center = (dist1 + dist2 + dist3) * centerscaler - viewdist;
-       #if SLOWMATH
-                       i = (int) center;
-                       i = bound(0, i, (TRANSDEPTHRES - 1));
-       #else
-                       if (center < 0.0f)
-                               center = 0.0f;
-                       center += 8388608.0f;
-                       i = *((long *)&center) & 0x7FFFFF;
-                       i = min(i, (TRANSDEPTHRES - 1));
-       #endif
-                       tri->next = buf_transtri_list[i];
-                       buf_transtri_list[i] = tri;
-                       k++;
-               }
-
-               if (currentmesh + k > max_meshs || currenttriangle + k > max_batch || currentvertex + k * 3 > max_verts)
-                       R_Mesh_Render();
-
-               currenttransmesh = 0;
-               currenttranstriangle = 0;
-               currenttransvertex = 0;
-
-               // note: can't batch these because they can be rendered in any order
-               // there can never be more transparent triangles than fit in main buffers
-               for (j = TRANSDEPTHRES - 1;j >= 0;j--)
-               {
-                       if ((tri = buf_transtri_list[j]))
+                       if (unit->tcubemap != m->texcubemap[i])
                        {
-                               while(tri)
+                               if (m->texcubemap[i])
                                {
-                                       mesh = &buf_mesh[currentmesh++];
-                                       *mesh = *tri->mesh; // copy mesh properties
-                                       mesh->firstvert = currentvertex;
-                                       mesh->lastvert = currentvertex + 2;
-                                       mesh->firsttriangle = currenttriangle;
-                                       mesh->triangles = 1;
-                                       for (k = 0;k < 3;k++)
-                                       {
-                                               index = tri->index[k];
-                                               buf_tri[currenttriangle].index[k] = currentvertex;
-                                               memcpy(buf_vertex[currentvertex].v, buf_transvertex[index].v, sizeof(buf_vertex_t));
-                                               if (floatcolors)
-                                                       memcpy(buf_fcolor[currentvertex].c, buf_transfcolor[index].c, sizeof(buf_fcolor_t));
-                                               else
-                                                       memcpy(buf_bcolor[currentvertex].c, buf_transbcolor[index].c, sizeof(buf_bcolor_t));
-                                               for (i = 0;i < backendunits && tri->mesh->textures[i];i++)
-                                                       memcpy(buf_texcoord[i][currentvertex].t, buf_transtexcoord[i][index].t, sizeof(buf_texcoord_t));
-                                               currentvertex++;
-                                       }
-                                       currenttriangle++;
-                                       tri = tri->next;
+                                       if (unit->tcubemap == 0)
+                                               qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+                               }
+                               else
+                               {
+                                       if (unit->tcubemap)
+                                               qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
                                }
+                               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, (unit->tcubemap = m->texcubemap[i]));CHECKGLERROR
                        }
                }
-       }
-       else
-       {
-               int i, j, k;
-               float viewdistcompare, centerscaler, dist1, dist2, dist3, center, maxdist;
-               buf_vertex_t *vert1, *vert2, *vert3;
-               buf_transtri_t *tri;
-               buf_mesh_t *mesh;
-
-               // process and add transparent mesh triangles
-               if (!currenttranstriangle)
-                       return;
-
-               // map farclip to 0-4095 list range
-               centerscaler = (TRANSDEPTHRES / r_farclip) * (1.0f / 3.0f);
-               viewdistcompare = viewdist + 4.0f;
-
-               memset(buf_transtri_list, 0, TRANSDEPTHRES * sizeof(buf_transtri_t *));
-
-               // process in reverse because transtri_list adding code is in reverse as well
-               k = 0;
-               for (j = currenttranstriangle - 1;j >= 0;j--)
+               scale = max(m->texrgbscale[i], 1);
+               if (gl_state.units[i].rgbscale != scale)
                {
-                       tri = &buf_transtri[j];
-
-                       vert1 = &buf_transvertex[tri->index[0]];
-                       vert2 = &buf_transvertex[tri->index[1]];
-                       vert3 = &buf_transvertex[tri->index[2]];
-
-                       dist1 = DotProduct(vert1->v, vpn);
-                       dist2 = DotProduct(vert2->v, vpn);
-                       dist3 = DotProduct(vert3->v, vpn);
-
-                       maxdist = max(dist1, max(dist2, dist3));
-                       if (maxdist < viewdistcompare)
-                               continue;
-
-                       center = (dist1 + dist2 + dist3) * centerscaler - viewdist;
-       #if SLOWMATH
-                       i = (int) center;
-                       i = bound(0, i, (TRANSDEPTHRES - 1));
-       #else
-                       if (center < 0.0f)
-                               center = 0.0f;
-                       center += 8388608.0f;
-                       i = *((long *)&center) & 0x7FFFFF;
-                       i = min(i, (TRANSDEPTHRES - 1));
-       #endif
-                       tri->next = buf_transtri_list[i];
-                       buf_transtri_list[i] = tri;
-                       k++;
+                       if (gl_state.unit != i)
+                       {
+                               qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR
+                       }
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (gl_state.units[i].rgbscale = scale));CHECKGLERROR
                }
-
-               if (currentmesh + k > max_meshs || currenttriangle + k > max_batch || currentvertex + currenttransvertex > max_verts)
-                       R_Mesh_Render();
-
-               // note: can't batch these because they can be rendered in any order
-               // there can never be more transparent triangles than fit in main buffers
-               memcpy(&buf_vertex[currentvertex], &buf_transvertex[0], currenttransvertex * sizeof(buf_vertex_t));
-               if (floatcolors)
-                       memcpy(&buf_fcolor[currentvertex], &buf_transfcolor[0], currenttransvertex * sizeof(buf_fcolor_t));
-               else
-                       memcpy(&buf_fcolor[currentvertex], &buf_transbcolor[0], currenttransvertex * sizeof(buf_bcolor_t));
-               for (i = 0;i < backendunits;i++)
-                       memcpy(&buf_texcoord[i][currentvertex], &buf_transtexcoord[i][0], currenttransvertex * sizeof(buf_texcoord_t));
-
-               for (j = TRANSDEPTHRES - 1;j >= 0;j--)
+               scale = max(m->texalphascale[i], 1);
+               if (gl_state.units[i].alphascale != scale)
                {
-                       if ((tri = buf_transtri_list[j]))
+                       if (gl_state.unit != i)
                        {
-                               while(tri)
-                               {
-                                       mesh = &buf_mesh[currentmesh++];
-                                       *mesh = *tri->mesh; // copy mesh properties
-                                       buf_tri[currenttriangle].index[0] = tri->index[0] + currentvertex;
-                                       buf_tri[currenttriangle].index[1] = tri->index[1] + currentvertex;
-                                       buf_tri[currenttriangle].index[2] = tri->index[2] + currentvertex;
-                                       mesh->firstvert = min(buf_tri[currenttriangle].index[0], min(buf_tri[currenttriangle].index[1], buf_tri[currenttriangle].index[2]));
-                                       mesh->lastvert = max(buf_tri[currenttriangle].index[0], max(buf_tri[currenttriangle].index[1], buf_tri[currenttriangle].index[2]));
-                                       mesh->firsttriangle = currenttriangle++;
-                                       mesh->triangles = 1;
-                                       tri = tri->next;
-                               }
+                               qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR
                        }
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (gl_state.units[i].alphascale = scale));CHECKGLERROR
                }
-               currentvertex += currenttransvertex;
-               currenttransmesh = 0;
-               currenttranstriangle = 0;
-               currenttransvertex = 0;
        }
 }
 
-void R_Mesh_Draw(const rmeshinfo_t *m)
+void R_Mesh_State(const rmeshstate_t *m)
 {
-       // these are static because gcc runs out of virtual registers otherwise
-       static int i, j, *index, overbright;
-       static float c, *in, scaler, cr, cg, cb, ca;
-       static buf_mesh_t *mesh;
-       static buf_vertex_t *vert;
-       static buf_fcolor_t *fcolor;
-       static buf_bcolor_t *bcolor;
-       static buf_texcoord_t *texcoord[MAX_TEXTUREUNITS];
-       static buf_transtri_t *tri;
-       static byte br, bg, bb, ba;
-
-       if (m->index == NULL
-        || !m->numtriangles
-        || m->vertex == NULL
-        || !m->numverts)
-               return;
-       // ignore meaningless alpha meshs
-       if (!m->depthwrite && m->blendfunc1 == GL_SRC_ALPHA && (m->blendfunc2 == GL_ONE || m->blendfunc2 == GL_ONE_MINUS_SRC_ALPHA))
-       {
-               if (m->color)
-               {
-                       for (i = 0, in = m->color + 3;i < m->numverts;i++, (int)in += m->colorstep)
-                               if (*in >= 0.01f)
-                                       break;
-                       if (i == m->numverts)
-                               return;
-               }
-               else if (m->ca < 0.01f)
-                       return;
-       }
+       R_Mesh_MainState(m);
+       R_Mesh_TextureState(m);
+}
 
-       if (!backendactive)
-               Sys_Error("R_Mesh_Draw: called when backend is not active\n");
+/*
+==============================================================================
 
-       scaler = 1;
-       if (m->blendfunc2 == GL_SRC_COLOR)
-       {
-               if (m->blendfunc1 == GL_DST_COLOR) // 2x modulate with framebuffer
-                       scaler *= 0.5f;
-       }
-       else
-       {
-               if (m->tex[0])
-               {
-                       overbright = gl_combine.integer;
-                       if (overbright)
-                               scaler *= 0.25f;
-               }
-               if (lighthalf)
-                       scaler *= 0.5f;
-       }
+                                               SCREEN SHOTS
 
-       if (m->transparent)
-       {
-               if (currenttransmesh >= max_meshs || (currenttranstriangle + m->numtriangles) > max_meshs || (currenttransvertex + m->numverts) > max_verts)
-               {
-                       if (!transranout)
-                       {
-                               Con_Printf("R_Mesh_Draw: ran out of room for transparent meshs\n");
-                               transranout = true;
-                       }
-                       return;
-               }
+==============================================================================
+*/
 
-               vert = &buf_transvertex[currenttransvertex];
-               fcolor = &buf_transfcolor[currenttransvertex];
-               bcolor = &buf_transbcolor[currenttransvertex];
-               for (i = 0;i < backendunits;i++)
-                       texcoord[i] = &buf_transtexcoord[i][currenttransvertex];
-
-               // transmesh is only for storage of transparent meshs until they
-               // are inserted into the main mesh array
-               mesh = &buf_transmesh[currenttransmesh++];
-               mesh->blendfunc1 = m->blendfunc1;
-               mesh->blendfunc2 = m->blendfunc2;
-               mesh->depthmask = false;
-               mesh->depthtest = !m->depthdisable;
-               j = -1;
-               for (i = 0;i < backendunits;i++)
-               {
-                       if ((mesh->textures[i] = m->tex[i]))
-                               j = i;
-                       mesh->texturergbscale[i] = m->texrgbscale[i];
-                       if (mesh->texturergbscale[i] != 1 && mesh->texturergbscale[i] != 2 && mesh->texturergbscale[i] != 4)
-                               mesh->texturergbscale[i] = 1;
-               }
-               if (overbright && j >= 0)
-                       mesh->texturergbscale[j] = 4;
+qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height)
+{
+       qboolean ret;
+       int i;
+       qbyte *buffer;
 
-               // transparent meshs are broken up into individual triangles which can
-               // be sorted by depth
-               index = m->index;
-               for (i = 0;i < m->numtriangles;i++)
-               {
-                       tri = &buf_transtri[currenttranstriangle++];
-                       tri->mesh = mesh;
-                       tri->index[0] = *index++ + currenttransvertex;
-                       tri->index[1] = *index++ + currenttransvertex;
-                       tri->index[2] = *index++ + currenttransvertex;
-               }
+       if (!r_render.integer)
+               return false;
 
-               currenttransvertex += m->numverts;
-       }
-       else
-       {
-               if (m->numtriangles > max_meshs || m->numverts > max_verts)
-               {
-                       Con_Printf("R_Mesh_Draw: mesh too big for buffers\n");
-                       return;
-               }
+       buffer = Mem_Alloc(tempmempool, width*height*3);
+       qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+       CHECKGLERROR
 
-               if (currentmesh >= max_meshs || (currenttriangle + m->numtriangles) > max_batch || (currentvertex + m->numverts) > max_verts)
-                       R_Mesh_Render();
-
-               vert = &buf_vertex[currentvertex];
-               fcolor = &buf_fcolor[currentvertex];
-               bcolor = &buf_bcolor[currentvertex];
-               for (i = 0;i < backendunits;i++)
-                       texcoord[i] = &buf_texcoord[i][currentvertex];
-
-               mesh = &buf_mesh[currentmesh++];
-               mesh->blendfunc1 = m->blendfunc1;
-               mesh->blendfunc2 = m->blendfunc2;
-               mesh->depthmask = (m->blendfunc2 == GL_ZERO || m->depthwrite);
-               mesh->depthtest = !m->depthdisable;
-               mesh->firsttriangle = currenttriangle;
-               mesh->triangles = m->numtriangles;
-               j = -1;
-               for (i = 0;i < backendunits;i++)
-               {
-                       if ((mesh->textures[i] = m->tex[i]))
-                               j = i;
-                       mesh->texturergbscale[i] = m->texrgbscale[i];
-                       if (mesh->texturergbscale[i] != 1 && mesh->texturergbscale[i] != 2 && mesh->texturergbscale[i] != 4)
-                               mesh->texturergbscale[i] = 1;
-               }
-               if (overbright && j >= 0)
-                       mesh->texturergbscale[j] = 4;
-
-               // opaque meshs are rendered directly
-               index = (int *)&buf_tri[currenttriangle];
-               for (i = 0;i < m->numtriangles * 3;i++)
-                       index[i] = m->index[i] + currentvertex;
-               mesh->firstvert = currentvertex;
-               currenttriangle += m->numtriangles;
-               currentvertex += m->numverts;
-               mesh->lastvert = currentvertex - 1;
-       }
+       // LordHavoc: compensate for v_overbrightbits when using hardware gamma
+       if (v_hwgamma.integer)
+               for (i = 0;i < width * height * 3;i++)
+                       buffer[i] <<= v_overbrightbits.integer;
 
-       // vertex array code is shared for transparent and opaque meshs
+       ret = Image_WriteTGARGB_preflipped(filename, width, height, buffer);
 
-       c_meshtris += m->numtriangles;
+       Mem_Free(buffer);
+       return ret;
+}
 
-       if (m->vertexstep != sizeof(buf_vertex_t))
-       {
-               for (i = 0, in = m->vertex;i < m->numverts;i++, (int)in += m->vertexstep)
-               {
-                       vert[i].v[0] = in[0];
-                       vert[i].v[1] = in[1];
-                       vert[i].v[2] = in[2];
-               }
-       }
-       else
-               memcpy(vert, m->vertex, m->numverts * sizeof(buf_vertex_t));
+//=============================================================================
 
-       if (floatcolors)
-       {
-               if (m->color)
-               {
-                       for (i = 0, in = m->color;i < m->numverts;i++, (int)in += m->colorstep)
-                       {
-                               fcolor[i].c[0] = in[0] * scaler;
-                               fcolor[i].c[1] = in[1] * scaler;
-                               fcolor[i].c[2] = in[2] * scaler;
-                               fcolor[i].c[3] = in[3];
-                       }
-               }
-               else
-               {
-                       cr = m->cr * scaler;
-                       cg = m->cg * scaler;
-                       cb = m->cb * scaler;
-                       ca = m->ca;
-                       for (i = 0;i < m->numverts;i++)
-                       {
-                               fcolor[i].c[0] = cr;
-                               fcolor[i].c[1] = cg;
-                               fcolor[i].c[2] = cb;
-                               fcolor[i].c[3] = ca;
-                       }
-               }
-       }
-       else
+void R_ClearScreen(void)
+{
+       if (r_render.integer)
        {
-               if (m->color)
+               // clear to black
+               qglClearColor(0,0,0,0);CHECKGLERROR
+               // clear the screen
+               qglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0));CHECKGLERROR
+               // set dithering mode
+               if (gl_dither.integer)
                {
-                       for (i = 0, in = m->color;i < m->numverts;i++, (int)in += m->colorstep)
-                       {
-                               // shift float to have 8bit fraction at base of number,
-                               // then read as integer and kill float bits...
-                               c = in[0] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bcolor[i].c[0] = (byte) j;
-                               c = in[1] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bcolor[i].c[1] = (byte) j;
-                               c = in[2] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bcolor[i].c[2] = (byte) j;
-                               c = in[3]          + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bcolor[i].c[3] = (byte) j;
-                       }
+                       qglEnable(GL_DITHER);CHECKGLERROR
                }
                else
                {
-                       c = in[0] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;br = (byte) j;
-                       c = in[1] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bg = (byte) j;
-                       c = in[2] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bb = (byte) j;
-                       c = in[3]          + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;ba = (byte) j;
-                       for (i = 0;i < m->numverts;i++)
-                       {
-                               bcolor[i].c[0] = br;
-                               bcolor[i].c[1] = bg;
-                               bcolor[i].c[2] = bb;
-                               bcolor[i].c[3] = ba;
-                       }
+                       qglDisable(GL_DITHER);CHECKGLERROR
                }
        }
-
-       for (j = 0;j < MAX_TEXTUREUNITS && m->tex[j];j++)
-       {
-               if (j >= backendunits)
-                       Sys_Error("R_Mesh_Draw: texture %i supplied when there are only %i texture units\n", j + 1, backendunits);
-               if (m->texcoordstep[j] != sizeof(buf_texcoord_t))
-               {
-                       for (i = 0, in = m->texcoords[j];i < m->numverts;i++, (int)in += m->texcoordstep[j])
-                       {
-                               texcoord[j][i].t[0] = in[0];
-                               texcoord[j][i].t[1] = in[1];
-                       }
-               }
-               else
-                       memcpy(&texcoord[j][0].t[0], m->texcoords[j], m->numverts * sizeof(buf_texcoord_t));
-       }
-       #if 0
-       for (;j < backendunits;j++)
-               memset(&texcoord[j][0].t[0], 0, m->numverts * sizeof(buf_texcoord_t));
-       #endif
 }
 
-void R_Mesh_DrawPolygon(rmeshinfo_t *m, int numverts)
-{
-       m->index = polyindexarray;
-       m->numverts = numverts;
-       m->numtriangles = numverts - 2;
-       if (m->numtriangles < 1)
-       {
-               Con_Printf("R_Mesh_DrawPolygon: invalid vertex count\n");
-               return;
-       }
-       if (m->numtriangles >= 256)
-       {
-               Con_Printf("R_Mesh_DrawPolygon: only up to 256 triangles (258 verts) supported\n");
-               return;
-       }
-       R_Mesh_Draw(m);
-}
+/*
+==================
+SCR_UpdateScreen
 
-// LordHavoc: this thing is evil, but necessary because decals account for so much overhead
-void R_Mesh_DrawDecal(const rmeshinfo_t *m)
+This is called every frame, and can also be called explicitly to flush
+text to the screen.
+==================
+*/
+void SCR_UpdateScreen (void)
 {
-       // these are static because gcc runs out of virtual registers otherwise
-       static int i, j, *index, overbright;
-       static float c, *in, scaler, cr, cg, cb, ca;
-       static buf_mesh_t *mesh;
-       static buf_vertex_t *vert;
-       static buf_fcolor_t *fcolor;
-       static buf_bcolor_t *bcolor;
-       static buf_texcoord_t *texcoord;
-       static buf_transtri_t *tri;
-       static byte br, bg, bb, ba;
-
-       if (!backendactive)
-               Sys_Error("R_Mesh_Draw: called when backend is not active\n");
-
-       scaler = 1;
-       if (m->tex[0])
-       {
-               overbright = gl_combine.integer;
-               if (overbright)
-                       scaler *= 0.25f;
-       }
-       if (lighthalf)
-               scaler *= 0.5f;
+       VID_Finish ();
 
-       if (m->transparent)
-       {
-               if (currenttransmesh >= max_meshs || (currenttranstriangle + 2) > max_meshs || (currenttransvertex + 4) > max_verts)
-               {
-                       if (!transranout)
-                       {
-                               Con_Printf("R_Mesh_Draw: ran out of room for transparent meshs\n");
-                               transranout = true;
-                       }
-                       return;
-               }
+       R_TimeReport("finish");
 
-               vert = &buf_transvertex[currenttransvertex];
-               fcolor = &buf_transfcolor[currenttransvertex];
-               bcolor = &buf_transbcolor[currenttransvertex];
-               texcoord = &buf_transtexcoord[0][currenttransvertex];
-
-               // transmesh is only for storage of transparent meshs until they
-               // are inserted into the main mesh array
-               mesh = &buf_transmesh[currenttransmesh++];
-               mesh->blendfunc1 = m->blendfunc1;
-               mesh->blendfunc2 = m->blendfunc2;
-               mesh->depthmask = false;
-               mesh->depthtest = true;
-               mesh->textures[0] = m->tex[0];
-               mesh->texturergbscale[0] = overbright ? 4 : 1;
-               for (i = 1;i < backendunits;i++)
-               {
-                       mesh->textures[i] = 0;
-                       mesh->texturergbscale[i] = 1;
-               }
+       if (r_textureunits.integer > gl_textureunits)
+               Cvar_SetValueQuick(&r_textureunits, gl_textureunits);
+       if (r_textureunits.integer < 1)
+               Cvar_SetValueQuick(&r_textureunits, 1);
 
-               // transparent meshs are broken up into individual triangles which can
-               // be sorted by depth
-               index = m->index;
-               tri = &buf_transtri[currenttranstriangle++];
-               tri->mesh = mesh;
-               tri->index[0] = 0 + currenttransvertex;
-               tri->index[1] = 1 + currenttransvertex;
-               tri->index[2] = 2 + currenttransvertex;
-               tri = &buf_transtri[currenttranstriangle++];
-               tri->mesh = mesh;
-               tri->index[0] = 0 + currenttransvertex;
-               tri->index[1] = 2 + currenttransvertex;
-               tri->index[2] = 3 + currenttransvertex;
-
-               currenttransvertex += 4;
-       }
-       else
-       {
-               if (2 > max_meshs || 4 > max_verts)
-               {
-                       Con_Printf("R_Mesh_Draw: mesh too big for buffers\n");
-                       return;
-               }
+       if (gl_combine.integer && (!gl_combine_extension || r_textureunits.integer < 2))
+               Cvar_SetValueQuick(&gl_combine, 0);
 
-               if (currentmesh >= max_meshs || (currenttriangle + 2) > max_batch || (currentvertex + 4) > max_verts)
-                       R_Mesh_Render();
-
-               vert = &buf_vertex[currentvertex];
-               fcolor = &buf_fcolor[currentvertex];
-               bcolor = &buf_bcolor[currentvertex];
-               texcoord = &buf_texcoord[0][currentvertex];
-
-               mesh = &buf_mesh[currentmesh++];
-               mesh->blendfunc1 = m->blendfunc1;
-               mesh->blendfunc2 = m->blendfunc2;
-               mesh->depthmask = false;
-               mesh->depthtest = !m->depthdisable;
-               mesh->firsttriangle = currenttriangle;
-               mesh->triangles = 2;
-               mesh->textures[0] = m->tex[0];
-               mesh->texturergbscale[0] = overbright ? 4 : 1;
-               for (i = 1;i < backendunits;i++)
-               {
-                       mesh->textures[i] = 0;
-                       mesh->texturergbscale[i] = 1;
-               }
+       // lighting scale
+       r_colorscale = 1.0f / (float) (1 << v_overbrightbits.integer);
 
-               // opaque meshs are rendered directly
-               index = (int *)&buf_tri[currenttriangle];
-               index[0] = 0 + currentvertex;
-               index[1] = 1 + currentvertex;
-               index[2] = 2 + currentvertex;
-               index[3] = 0 + currentvertex;
-               index[4] = 2 + currentvertex;
-               index[5] = 3 + currentvertex;
-               mesh->firstvert = currentvertex;
-               currenttriangle += 2;
-               currentvertex += 4;
-               mesh->lastvert = currentvertex - 1;
-       }
+       // lightmaps only
+       r_lightmapscalebit = v_overbrightbits.integer;
+       if (gl_combine.integer && r_textureunits.integer > 1)
+               r_lightmapscalebit += 2;
 
-       // vertex array code is shared for transparent and opaque meshs
+       R_TimeReport("setup");
 
-       c_meshtris += 2;
+       R_ClearScreen();
 
-       // buf_vertex_t must match the size of the decal vertex array (or vice versa)
-       memcpy(vert, m->vertex, 4 * sizeof(buf_vertex_t));
+       R_TimeReport("clear");
 
-       if (floatcolors)
-       {
-               cr = m->cr * scaler;
-               cg = m->cg * scaler;
-               cb = m->cb * scaler;
-               ca = m->ca;
-               fcolor[0].c[0] = cr;
-               fcolor[0].c[1] = cg;
-               fcolor[0].c[2] = cb;
-               fcolor[0].c[3] = ca;
-               fcolor[1].c[0] = cr;
-               fcolor[1].c[1] = cg;
-               fcolor[1].c[2] = cb;
-               fcolor[1].c[3] = ca;
-               fcolor[2].c[0] = cr;
-               fcolor[2].c[1] = cg;
-               fcolor[2].c[2] = cb;
-               fcolor[2].c[3] = ca;
-               fcolor[3].c[0] = cr;
-               fcolor[3].c[1] = cg;
-               fcolor[3].c[2] = cb;
-               fcolor[3].c[3] = ca;
-       }
-       else
-       {
-               c = in[0] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;br = (byte) j;
-               c = in[1] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bg = (byte) j;
-               c = in[2] * scaler + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;bb = (byte) j;
-               c = in[3]          + 32768.0f;j = (*((long *)&c) & 0x7FFFFF);if (j > 255) j = 255;ba = (byte) j;
-               bcolor[0].c[0] = br;
-               bcolor[0].c[1] = bg;
-               bcolor[0].c[2] = bb;
-               bcolor[0].c[3] = ba;
-               bcolor[1].c[0] = br;
-               bcolor[1].c[1] = bg;
-               bcolor[1].c[2] = bb;
-               bcolor[1].c[3] = ba;
-               bcolor[2].c[0] = br;
-               bcolor[2].c[1] = bg;
-               bcolor[2].c[2] = bb;
-               bcolor[2].c[3] = ba;
-               bcolor[3].c[0] = br;
-               bcolor[3].c[1] = bg;
-               bcolor[3].c[2] = bb;
-               bcolor[3].c[3] = ba;
-       }
+       if (scr_conlines < vid.conheight && cls.signon == SIGNONS)
+               R_RenderView();
+
+       // draw 2D stuff
+       R_DrawQueue();
 
-       // buf_texcoord_t must be the same size as the decal texcoord array (or vice versa)
-       memcpy(&texcoord[0].t[0], m->texcoords[0], 4 * sizeof(buf_texcoord_t));
+       // tell driver to commit it's partially full geometry queue to the rendering queue
+       // (this doesn't wait for the commands themselves to complete)
+       qglFlush();
 }
+