]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rsurf.c
bmodel shadow volumes
[xonotic/darkplaces.git] / gl_rsurf.c
index 7ae39a86bb17cf416b8751bc5aa5066a8a224619..9448717d8f77e6d51a6954f6f6d71c89f51ce466 100644 (file)
@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // r_surf.c: surface-related refresh code
 
 #include "quakedef.h"
+#include "r_shadow.h"
 
 #define MAX_LIGHTMAP_SIZE 256
 
-static signed int blocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
+static unsigned int intblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
+static float floatblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
 
 static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4];
 
@@ -32,62 +34,35 @@ cvar_t r_vertexsurfaces = {0, "r_vertexsurfaces", "0"};
 cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"};
 cvar_t r_drawportals = {0, "r_drawportals", "0"};
 cvar_t r_testvis = {0, "r_testvis", "0"};
-
-static void gl_surf_start(void)
-{
-}
-
-static void gl_surf_shutdown(void)
-{
-}
-
-static void gl_surf_newmap(void)
-{
-}
+cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"};
+cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"};
+cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "0"};
 
 static int dlightdivtable[32768];
 
-void GL_Surf_Init(void)
-{
-       int i;
-       dlightdivtable[0] = 4194304;
-       for (i = 1;i < 32768;i++)
-               dlightdivtable[i] = 4194304 / (i << 7);
-
-       Cvar_RegisterVariable(&r_ambient);
-       Cvar_RegisterVariable(&r_vertexsurfaces);
-       Cvar_RegisterVariable(&r_dlightmap);
-       Cvar_RegisterVariable(&r_drawportals);
-       Cvar_RegisterVariable(&r_testvis);
-
-       R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
-}
+// variables used by R_PVSUpdate
+int r_pvsframecount = 0;
+mleaf_t *r_pvsviewleaf = NULL;
+int r_pvsviewleafnovis = 0;
 
-static int R_AddDynamicLights (msurface_t *surf)
+static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 {
-       int         sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract;
+       int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract, k;
        unsigned int *bl;
-       float       dist;
-       vec3_t      impact, local;
-
-       // LordHavoc: use 64bit integer...  shame it's not very standardized...
-#if _MSC_VER || __BORLANDC__
-       __int64     k;
-#else
-       long long   k;
-#endif
+       float dist, impact[3], local[3];
 
        lit = false;
 
        smax = (surf->extents[0] >> 4) + 1;
        tmax = (surf->extents[1] >> 4) + 1;
+       smax3 = smax * 3;
 
        for (lnum = 0; lnum < r_numdlights; lnum++)
        {
                if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
                        continue;                                       // not lit by this light
 
-               softwareuntransform(r_dlight[lnum].origin, local);
+               Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local);
                dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 
                // for comparisons to minimum acceptable light
@@ -99,9 +74,17 @@ static int R_AddDynamicLights (msurface_t *surf)
                if (dist2 >= maxdist)
                        continue;
 
-               impact[0] = local[0] - surf->plane->normal[0] * dist;
-               impact[1] = local[1] - surf->plane->normal[1] * dist;
-               impact[2] = local[2] - surf->plane->normal[2] * dist;
+               if (surf->plane->type < 3)
+               {
+                       VectorCopy(local, impact);
+                       impact[surf->plane->type] -= dist;
+               }
+               else
+               {
+                       impact[0] = local[0] - surf->plane->normal[0] * dist;
+                       impact[1] = local[1] - surf->plane->normal[1] * dist;
+                       impact[2] = local[2] - surf->plane->normal[2] * dist;
+               }
 
                impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
                impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
@@ -119,12 +102,11 @@ static int R_AddDynamicLights (msurface_t *surf)
                maxdist3 = maxdist - dist2;
 
                // convert to 8.8 blocklights format
-               red = r_dlight[lnum].light[0];
-               green = r_dlight[lnum].light[1];
-               blue = r_dlight[lnum].light[2];
-               subtract = (int) (r_dlight[lnum].lightsubtract * 4194304.0f);
-               bl = blocklights;
-               smax3 = smax * 3;
+               red = r_dlight[lnum].light[0] * (1.0f / 128.0f);
+               green = r_dlight[lnum].light[1] * (1.0f / 128.0f);
+               blue = r_dlight[lnum].light[2] * (1.0f / 128.0f);
+               subtract = (int) (r_dlight[lnum].subtract * 4194304.0f);
+               bl = intblocklights;
 
                i = impactt;
                for (t = 0;t < tmax;t++, i -= 16)
@@ -141,9 +123,9 @@ static int R_AddDynamicLights (msurface_t *surf)
                                                k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract;
                                                if (k > 0)
                                                {
-                                                       bl[0] += (red   * k) >> 8;
-                                                       bl[1] += (green * k) >> 8;
-                                                       bl[2] += (blue  * k) >> 8;
+                                                       bl[0] += (red   * k);
+                                                       bl[1] += (green * k);
+                                                       bl[2] += (blue  * k);
                                                        lit = true;
                                                }
                                        }
@@ -157,30 +139,301 @@ static int R_AddDynamicLights (msurface_t *surf)
        return lit;
 }
 
-void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8])
+static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 {
-       float ndist;
-       msurface_t *surf, *endsurf;
-       int sdtable[256], td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, dist2, impacts, impactt, subtract, a, stained, cr, cg, cb, ca, ratio;
-       qbyte *bl;
-       vec3_t impact;
-       // LordHavoc: use 64bit integer...  shame it's not very standardized...
-#if _MSC_VER || __BORLANDC__
-       __int64     k;
-#else
-       long long   k;
-#endif
+       int lnum, s, t, smax, tmax, smax3, lit, impacts, impactt;
+       float sdtable[256], *bl, k, dist, dist2, maxdist, maxdist2, maxdist3, td1, td, red, green, blue, impact[3], local[3], subtract;
+
+       lit = false;
+
+       smax = (surf->extents[0] >> 4) + 1;
+       tmax = (surf->extents[1] >> 4) + 1;
+       smax3 = smax * 3;
+
+       for (lnum = 0; lnum < r_numdlights; lnum++)
+       {
+               if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
+                       continue;                                       // not lit by this light
+
+               Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local);
+               dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
+
+               // for comparisons to minimum acceptable light
+               // compensate for LIGHTOFFSET
+               maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET;
+
+               dist2 = dist * dist;
+               dist2 += LIGHTOFFSET;
+               if (dist2 >= maxdist)
+                       continue;
+
+               if (surf->plane->type < 3)
+               {
+                       VectorCopy(local, impact);
+                       impact[surf->plane->type] -= dist;
+               }
+               else
+               {
+                       impact[0] = local[0] - surf->plane->normal[0] * dist;
+                       impact[1] = local[1] - surf->plane->normal[1] * dist;
+                       impact[2] = local[2] - surf->plane->normal[2] * dist;
+               }
+
+               impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
+               impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
+
+               td = bound(0, impacts, smax * 16) - impacts;
+               td1 = bound(0, impactt, tmax * 16) - impactt;
+               td = td * td + td1 * td1 + dist2;
+               if (td > maxdist)
+                       continue;
+
+               // reduce calculations
+               for (s = 0, td1 = impacts; s < smax; s++, td1 -= 16.0f)
+                       sdtable[s] = td1 * td1 + dist2;
+
+               maxdist3 = maxdist - dist2;
+
+               // convert to 8.8 blocklights format
+               red = r_dlight[lnum].light[0];
+               green = r_dlight[lnum].light[1];
+               blue = r_dlight[lnum].light[2];
+               subtract = r_dlight[lnum].subtract * 32768.0f;
+               bl = floatblocklights;
+
+               td1 = impactt;
+               for (t = 0;t < tmax;t++, td1 -= 16.0f)
+               {
+                       td = td1 * td1;
+                       // make sure some part of it is visible on this line
+                       if (td < maxdist3)
+                       {
+                               maxdist2 = maxdist - td;
+                               for (s = 0;s < smax;s++)
+                               {
+                                       if (sdtable[s] < maxdist2)
+                                       {
+                                               k = (32768.0f / (sdtable[s] + td)) - subtract;
+                                               bl[0] += red   * k;
+                                               bl[1] += green * k;
+                                               bl[2] += blue  * k;
+                                               lit = true;
+                                       }
+                                       bl += 3;
+                               }
+                       }
+                       else // skip line
+                               bl += smax3;
+               }
+       }
+       return lit;
+}
+
+/*
+===============
+R_BuildLightMap
+
+Combine and scale multiple lightmaps into the 8.8 format in blocklights
+===============
+*/
+static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int dlightchanged)
+{
+       if (!r_floatbuildlightmap.integer)
+       {
+               int smax, tmax, i, j, size, size3, shift, maps, stride, l;
+               unsigned int *bl, scale;
+               qbyte *lightmap, *out, *stain;
+
+               // update cached lighting info
+               surf->cached_dlight = 0;
+               surf->cached_lightmapscalebit = r_lightmapscalebit;
+               surf->cached_ambient = r_ambient.value;
+               surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
+               surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
+               surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
+               surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
+
+               smax = (surf->extents[0]>>4)+1;
+               tmax = (surf->extents[1]>>4)+1;
+               size = smax*tmax;
+               size3 = size*3;
+               lightmap = surf->samples;
+
+       // set to full bright if no light data
+               bl = intblocklights;
+               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
+               {
+                       for (i = 0;i < size3;i++)
+                               bl[i] = 255*256;
+               }
+               else
+               {
+       // clear to no light
+                       j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
+                       if (j)
+                       {
+                               for (i = 0;i < size3;i++)
+                                       *bl++ = j;
+                       }
+                       else
+                               memset(bl, 0, size*3*sizeof(unsigned int));
+
+                       if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+                       {
+                               surf->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surf);
+                               if (surf->cached_dlight)
+                                       c_light_polys++;
+                               else if (dlightchanged)
+                                       return; // don't upload if only updating dlights and none mattered
+                       }
+
+       // add all the lightmaps
+                       if (lightmap)
+                       {
+                               bl = intblocklights;
+                               for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
+                                       for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
+                                               bl[i] += lightmap[i] * scale;
+                       }
+               }
+
+               stain = surf->stainsamples;
+               bl = intblocklights;
+               out = templight;
+               // deal with lightmap brightness scale
+               shift = 7 + r_lightmapscalebit + 8;
+               if (ent->model->lightmaprgba)
+               {
+                       stride = (surf->lightmaptexturestride - smax) * 4;
+                       for (i = 0;i < tmax;i++, out += stride)
+                       {
+                               for (j = 0;j < smax;j++)
+                               {
+                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                                       *out++ = 255;
+                               }
+                       }
+               }
+               else
+               {
+                       stride = (surf->lightmaptexturestride - smax) * 3;
+                       for (i = 0;i < tmax;i++, out += stride)
+                       {
+                               for (j = 0;j < smax;j++)
+                               {
+                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                               }
+                       }
+               }
+
+               R_UpdateTexture(surf->lightmaptexture, templight);
+       }
+       else
+       {
+               int smax, tmax, i, j, size, size3, maps, stride, l;
+               float *bl, scale;
+               qbyte *lightmap, *out, *stain;
+
+               // update cached lighting info
+               surf->cached_dlight = 0;
+               surf->cached_lightmapscalebit = r_lightmapscalebit;
+               surf->cached_ambient = r_ambient.value;
+               surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
+               surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
+               surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
+               surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
+
+               smax = (surf->extents[0]>>4)+1;
+               tmax = (surf->extents[1]>>4)+1;
+               size = smax*tmax;
+               size3 = size*3;
+               lightmap = surf->samples;
+
+       // set to full bright if no light data
+               bl = floatblocklights;
+               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
+                       j = 255*256;
+               else
+                       j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
+
+               // clear to no light
+               if (j)
+               {
+                       for (i = 0;i < size3;i++)
+                               *bl++ = j;
+               }
+               else
+                       memset(bl, 0, size*3*sizeof(float));
+
+               if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+               {
+                       surf->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surf);
+                       if (surf->cached_dlight)
+                               c_light_polys++;
+                       else if (dlightchanged)
+                               return; // don't upload if only updating dlights and none mattered
+               }
+
+               // add all the lightmaps
+               if (lightmap)
+               {
+                       bl = floatblocklights;
+                       for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
+                               for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
+                                       bl[i] += lightmap[i] * scale;
+               }
 
+               stain = surf->stainsamples;
+               bl = floatblocklights;
+               out = templight;
+               // deal with lightmap brightness scale
+               scale = 1.0f / (1 << (7 + r_lightmapscalebit + 8));
+               if (ent->model->lightmaprgba)
+               {
+                       stride = (surf->lightmaptexturestride - smax) * 4;
+                       for (i = 0;i < tmax;i++, out += stride)
+                       {
+                               for (j = 0;j < smax;j++)
+                               {
+                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+                                       *out++ = 255;
+                               }
+                       }
+               }
+               else
+               {
+                       stride = (surf->lightmaptexturestride - smax) * 3;
+                       for (i = 0;i < tmax;i++, out += stride)
+                       {
+                               for (j = 0;j < smax;j++)
+                               {
+                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+                               }
+                       }
+               }
 
-       // for comparisons to minimum acceptable light
-       // compensate for 4096 offset
-       maxdist = radius * radius + 4096;
+               R_UpdateTexture(surf->lightmaptexture, templight);
+       }
+}
 
-       // clamp radius to avoid exceeding 32768 entry division table
-       if (maxdist > 4194304)
-               maxdist = 4194304;
+void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, float fcolor[8])
+{
+       float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2;
+       msurface_t *surf, *endsurf;
+       int i, s, t, smax, tmax, smax3, impacts, impactt, stained;
+       qbyte *bl;
+       vec3_t impact;
 
-       subtract = (int) ((1.0f / maxdist) * 4194304.0f);
+       maxdist = radius * radius;
+       invradius = 1.0f / radius;
 
 loc0:
        if (node->contents < 0)
@@ -198,81 +451,77 @@ loc0:
        }
 
        dist2 = ndist * ndist;
-       dist2 += 4096.0f;
-       if (dist2 < maxdist)
-       {
-               maxdist3 = maxdist - dist2;
+       maxdist3 = maxdist - dist2;
 
+       if (node->plane->type < 3)
+       {
+               VectorCopy(origin, impact);
+               impact[node->plane->type] -= ndist;
+       }
+       else
+       {
                impact[0] = origin[0] - node->plane->normal[0] * ndist;
                impact[1] = origin[1] - node->plane->normal[1] * ndist;
                impact[2] = origin[2] - node->plane->normal[2] * ndist;
+       }
 
-               for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
+       for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
+       {
+               if (surf->stainsamples)
                {
-                       if (surf->stainsamples)
-                       {
-                               smax = (surf->extents[0] >> 4) + 1;
-                               tmax = (surf->extents[1] >> 4) + 1;
+                       smax = (surf->extents[0] >> 4) + 1;
+                       tmax = (surf->extents[1] >> 4) + 1;
 
-                               impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
-                               impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
+                       impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
+                       impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
 
-                               s = bound(0, impacts, smax * 16) - impacts;
-                               t = bound(0, impactt, tmax * 16) - impactt;
-                               i = s * s + t * t + dist2;
-                               if (i > maxdist)
-                                       continue;
+                       s = bound(0, impacts, smax * 16) - impacts;
+                       t = bound(0, impactt, tmax * 16) - impactt;
+                       i = s * s + t * t + dist2;
+                       if (i > maxdist)
+                               continue;
 
-                               // reduce calculations
-                               for (s = 0, i = impacts; s < smax; s++, i -= 16)
-                                       sdtable[s] = i * i + dist2;
+                       // reduce calculations
+                       for (s = 0, i = impacts; s < smax; s++, i -= 16)
+                               sdtable[s] = i * i + dist2;
 
-                               // convert to 8.8 blocklights format
-                               bl = surf->stainsamples;
-                               smax3 = smax * 3;
-                               stained = false;
+                       bl = surf->stainsamples;
+                       smax3 = smax * 3;
+                       stained = false;
 
-                               i = impactt;
-                               for (t = 0;t < tmax;t++, i -= 16)
+                       i = impactt;
+                       for (t = 0;t < tmax;t++, i -= 16)
+                       {
+                               td = i * i;
+                               // make sure some part of it is visible on this line
+                               if (td < maxdist3)
                                {
-                                       td = i * i;
-                                       // make sure some part of it is visible on this line
-                                       if (td < maxdist3)
+                                       maxdist2 = maxdist - td;
+                                       for (s = 0;s < smax;s++)
                                        {
-                                               maxdist2 = maxdist - td;
-                                               for (s = 0;s < smax;s++)
+                                               if (sdtable[s] < maxdist2)
                                                {
-                                                       if (sdtable[s] < maxdist2)
+                                                       ratio = lhrandom(0.0f, 1.0f);
+                                                       a = (fcolor[3] + ratio * fcolor[7]) * (1.0f - sqrt(sdtable[s] + td) * invradius);
+                                                       if (a >= (1.0f / 64.0f))
                                                        {
-                                                               k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract;
-                                                               if (k > 0)
-                                                               {
-                                                                       ratio = rand() & 255;
-                                                                       ca = (((icolor[7] - icolor[3]) * ratio) >> 8) + icolor[3];
-                                                                       a = (ca * k) >> 8;
-                                                                       if (a > 0)
-                                                                       {
-                                                                               a = bound(0, a, 256);
-                                                                               cr = (((icolor[4] - icolor[0]) * ratio) >> 8) + icolor[0];
-                                                                               cg = (((icolor[5] - icolor[1]) * ratio) >> 8) + icolor[1];
-                                                                               cb = (((icolor[6] - icolor[2]) * ratio) >> 8) + icolor[2];
-                                                                               bl[0] = (qbyte) ((((cr - (int) bl[0]) * a) >> 8) + (int) bl[0]);
-                                                                               bl[1] = (qbyte) ((((cg - (int) bl[1]) * a) >> 8) + (int) bl[1]);
-                                                                               bl[2] = (qbyte) ((((cb - (int) bl[2]) * a) >> 8) + (int) bl[2]);
-                                                                               stained = true;
-                                                                       }
-                                                               }
+                                                               if (a > 1)
+                                                                       a = 1;
+                                                               bl[0] = (qbyte) ((float) bl[0] + a * ((fcolor[0] + ratio * fcolor[4]) - (float) bl[0]));
+                                                               bl[1] = (qbyte) ((float) bl[1] + a * ((fcolor[1] + ratio * fcolor[5]) - (float) bl[1]));
+                                                               bl[2] = (qbyte) ((float) bl[2] + a * ((fcolor[2] + ratio * fcolor[6]) - (float) bl[2]));
+                                                               stained = true;
                                                        }
-                                                       bl += 3;
                                                }
+                                               bl += 3;
                                        }
-                                       else // skip line
-                                               bl += smax3;
                                }
-                               // force lightmap upload
-                               if (stained)
-                                       surf->cached_dlight = true;
+                               else // skip line
+                                       bl += smax3;
                        }
+                       // force lightmap upload
+                       if (stained)
+                               surf->cached_dlight = true;
                }
        }
 
@@ -280,7 +529,7 @@ loc0:
        {
                if (node->children[1]->contents >= 0)
                {
-                       R_StainNode(node->children[0], model, origin, radius, icolor);
+                       R_StainNode(node->children[0], model, origin, radius, fcolor);
                        node = node->children[1];
                        goto loc0;
                }
@@ -299,372 +548,180 @@ loc0:
 
 void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2)
 {
-       int n, icolor[8];
+       int n;
+       float fcolor[8];
        entity_render_t *ent;
        model_t *model;
        vec3_t org;
-       icolor[0] = cr1;
-       icolor[1] = cg1;
-       icolor[2] = cb1;
-       icolor[3] = ca1;
-       icolor[4] = cr2;
-       icolor[5] = cg2;
-       icolor[6] = cb2;
-       icolor[7] = ca2;
+       fcolor[0] = cr1;
+       fcolor[1] = cg1;
+       fcolor[2] = cb1;
+       fcolor[3] = ca1 * (1.0f / 64.0f);
+       fcolor[4] = cr2 - cr1;
+       fcolor[5] = cg2 - cg1;
+       fcolor[6] = cb2 - cb1;
+       fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f);
 
        model = cl.worldmodel;
-       softwaretransformidentity();
-       R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor);
+       if (model)
+               R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, fcolor);
 
        // look for embedded bmodels
-       for (n = 1;n < MAX_EDICTS;n++)
+       for (n = 0;n < cl_num_brushmodel_entities;n++)
        {
-               ent = &cl_entities[n].render;
+               ent = cl_brushmodel_entities[n];
                model = ent->model;
                if (model && model->name[0] == '*')
                {
                        Mod_CheckLoaded(model);
                        if (model->type == mod_brush)
                        {
-                               softwaretransformforentity(ent);
-                               softwareuntransform(origin, org);
-                               R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor);
+                               Matrix4x4_Transform(&ent->inversematrix, origin, org);
+                               R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, fcolor);
                        }
                }
        }
 }
 
+
 /*
-===============
-R_BuildLightMap
+=============================================================
 
-Combine and scale multiple lightmaps into the 8.8 format in blocklights
-===============
+       BRUSH MODELS
+
+=============================================================
 */
-static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
+
+static void RSurf_AddLightmapToVertexColors(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles)
 {
-       int smax, tmax, i, j, size, size3, shift, scale, maps, *bl, stride, l;
-       qbyte *lightmap, *out, *stain;
-
-       // update cached lighting info
-       surf->cached_dlight = 0;
-       surf->cached_lightscalebit = lightscalebit;
-       surf->cached_ambient = r_ambient.value;
-       surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
-       surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
-       surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
-       surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
-
-       smax = (surf->extents[0]>>4)+1;
-       tmax = (surf->extents[1]>>4)+1;
-       size = smax*tmax;
-       size3 = size*3;
-       lightmap = surf->samples;
-
-// set to full bright if no light data
-       if ((currentrenderentity->effects & EF_FULLBRIGHT) || !cl.worldmodel->lightdata)
-       {
-               bl = blocklights;
-               for (i = 0;i < size3;i++)
-                       bl[i] = 255*256;
-       }
-       else
+       int i;
+       float scale;
+       const qbyte *lm;
+       if (styles[0] != 255)
        {
-// clear to no light
-               j = r_ambient.value * 512.0f; // would be 256.0f logically, but using 512.0f to match winquake style
-               if (j)
-               {
-                       bl = blocklights;
-                       for (i = 0;i < size3;i++)
-                               *bl++ = j;
-               }
-               else
-                       memset(&blocklights[0], 0, size*3*sizeof(int));
-
-               if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+               for (i = 0;i < numverts;i++, c += 4)
                {
-                       surf->cached_dlight = R_AddDynamicLights(surf);
-                       if (surf->cached_dlight)
-                               c_light_polys++;
-                       else if (dlightchanged)
-                               return; // don't upload if only updating dlights and none mattered
+                       lm = samples + lightmapoffsets[i];
+                       scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f);
+                       VectorMA(c, scale, lm, c);
+                       if (styles[1] != 255)
+                       {
+                               lm += size3;
+                               scale = d_lightstylevalue[styles[1]] * (1.0f / 32768.0f);
+                               VectorMA(c, scale, lm, c);
+                               if (styles[2] != 255)
+                               {
+                                       lm += size3;
+                                       scale = d_lightstylevalue[styles[2]] * (1.0f / 32768.0f);
+                                       VectorMA(c, scale, lm, c);
+                                       if (styles[3] != 255)
+                                       {
+                                               lm += size3;
+                                               scale = d_lightstylevalue[styles[3]] * (1.0f / 32768.0f);
+                                               VectorMA(c, scale, lm, c);
+                                       }
+                               }
+                       }
                }
+       }
+}
 
-// add all the lightmaps
-               if (lightmap)
+static void RSurf_FogColors(const float *v, float *c, float colorscale, int numverts, const float *modelorg)
+{
+       int i;
+       float diff[3], f;
+       if (fogenabled)
+       {
+               for (i = 0;i < numverts;i++, v += 4, c += 4)
                {
-                       bl = blocklights;
-                       for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
-                               for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
-                                       bl[i] += lightmap[i] * scale;
+                       VectorSubtract(v, modelorg, diff);
+                       f = colorscale * (1 - exp(fogdensity/DotProduct(diff, diff)));
+                       VectorScale(c, f, c);
                }
        }
+       else if (colorscale != 1)
+               for (i = 0;i < numverts;i++, c += 4)
+                       VectorScale(c, colorscale, c);
+}
 
-       stain = surf->stainsamples;
-       bl = blocklights;
-       out = templight;
-       // deal with lightmap brightness scale
-       shift = 15 + lightscalebit;
-       if (currentrenderentity->model->lightmaprgba)
+static void RSurf_FoggedColors(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg)
+{
+       int i;
+       float diff[3], f;
+       r *= colorscale;
+       g *= colorscale;
+       b *= colorscale;
+       if (fogenabled)
        {
-               stride = (surf->lightmaptexturestride - smax) * 4;
-               for (i = 0;i < tmax;i++, out += stride)
+               for (i = 0;i < numverts;i++, v += 4, c += 4)
                {
-                       for (j = 0;j < smax;j++)
-                       {
-                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                               *out++ = 255;
-                       }
+                       VectorSubtract(v, modelorg, diff);
+                       f = 1 - exp(fogdensity/DotProduct(diff, diff));
+                       c[0] = r * f;
+                       c[1] = g * f;
+                       c[2] = b * f;
+                       c[3] = a;
                }
        }
        else
        {
-               stride = (surf->lightmaptexturestride - smax) * 3;
-               for (i = 0;i < tmax;i++, out += stride)
+               for (i = 0;i < numverts;i++, c += 4)
                {
-                       for (j = 0;j < smax;j++)
-                       {
-                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                       }
+                       c[0] = r;
+                       c[1] = g;
+                       c[2] = b;
+                       c[3] = a;
                }
        }
-
-       R_UpdateTexture(surf->lightmaptexture, templight);
 }
 
-
-/*
-=============================================================
-
-       BRUSH MODELS
-
-=============================================================
-*/
-
-
-static float turbsin[256] =
+static void RSurf_FogPassColors(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg)
 {
-       #include "gl_warp_sin.h"
-};
-#define TURBSCALE (256.0 / (2 * M_PI))
-
-// only need to hold as many verts as the mesh splitter will allow in model_brush.c
-#define MAX_SURFVERTS 3072
-typedef struct
-{
-       float v[4];
-       float st[2];
-       float uv[2];
-       float c[4];
+       int i;
+       float diff[3], f;
+       r *= colorscale;
+       g *= colorscale;
+       b *= colorscale;
+       for (i = 0;i < numverts;i++, v += 4, c += 4)
+       {
+               VectorSubtract(v, modelorg, diff);
+               f = exp(fogdensity/DotProduct(diff, diff));
+               c[0] = r;
+               c[1] = g;
+               c[2] = b;
+               c[3] = a * f;
+       }
 }
-surfvert_t;
-static surfvert_t svert[MAX_SURFVERTS]; // used by the following functions
 
-static void RSurfShader_Sky(msurface_t *firstsurf)
+static void RSurf_ScaleColors(float *c, float scale, int numverts)
 {
-       msurface_t *surf;
        int i;
-       float number, length, dir[3], speedscale;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-
-       // LordHavoc: HalfLife maps have freaky skypolys...
-       if (currentrenderentity->model->ishlbsp)
-               return;
-
-       if (skyrendermasked)
-       {
-               if (skyrendernow)
-               {
-                       skyrendernow = false;
-                       R_Sky();
-               }
-               for (surf = firstsurf;surf;surf = surf->chain)
-               {
-                       // draw depth-only polys
-                       memset(&m, 0, sizeof(m));
-                       m.transparent = false;
-                       m.blendfunc1 = GL_ZERO;
-                       m.blendfunc2 = GL_ONE;
-                       m.depthwrite = true;
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               m.numtriangles = mesh->numtriangles;
-                               m.numverts = mesh->numverts;
-                               m.index = mesh->index;
-                               if (softwaretransform_complexity)
-                               {
-                                       m.vertex = &svert[0].v[0];
-                                       m.vertexstep = sizeof(surfvert_t);
-                                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                                               softwaretransform(v->v, sv->v);
-                               }
-                               else
-                               {
-                                       m.vertex = &mesh->vertex[0].v[0];
-                                       m.vertexstep = sizeof(surfvertex_t);
-                               }
-                               R_Mesh_Draw(&m);
-                       }
-               }
-       }
-       else if (skyrenderglquake)
-       {
-               for (surf = firstsurf;surf;surf = surf->chain)
-               {
-                       memset(&m, 0, sizeof(m));
-                       m.transparent = false;
-                       m.blendfunc1 = GL_ONE;
-                       m.blendfunc2 = GL_ZERO;
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       m.cr = 1;
-                       m.cg = 1;
-                       m.cb = 1;
-                       m.ca = 1;
-                       m.tex[0] = R_GetTexture(solidskytexture);
-                       m.texcoords[0] = &svert[0].st[0];
-                       m.texcoordstep[0] = sizeof(surfvert_t);
-                       speedscale = cl.time * (8.0/128.0);
-                       speedscale -= (int)speedscale;
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               m.numtriangles = mesh->numtriangles;
-                               m.numverts = mesh->numverts;
-                               m.index = mesh->index;
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       softwaretransform(v->v, sv->v);
-                                       VectorSubtract (sv->v, r_origin, dir);
-                                       // flatten the sphere
-                                       dir[2] *= 3;
-
-                                       number = DotProduct(dir, dir);
-                                       #if SLOWMATH
-                                       length = 3.0f / sqrt(number);
-                                       #else
-                                       *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1);
-                                       length = 3.0f * (length * (1.5f - (number * 0.5f * length * length)));
-                                       #endif
-
-                                       sv->st[0] = speedscale + dir[0] * length;
-                                       sv->st[1] = speedscale + dir[1] * length;
-                               }
-                               R_Mesh_Draw(&m);
-                       }
-               }
-       }
-       else
-       {
-               for (surf = firstsurf;surf;surf = surf->chain)
-               {
-                       // flat color
-                       memset(&m, 0, sizeof(m));
-                       m.transparent = false;
-                       m.blendfunc1 = GL_ONE;
-                       m.blendfunc2 = GL_ZERO;
-                       m.cr = fogcolor[0];
-                       m.cg = fogcolor[1];
-                       m.cb = fogcolor[2];
-                       m.ca = 1;
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               m.numtriangles = mesh->numtriangles;
-                               m.numverts = mesh->numverts;
-                               m.index = mesh->index;
-                               if (softwaretransform_complexity)
-                               {
-                                       m.vertex = &svert[0].v[0];
-                                       m.vertexstep = sizeof(surfvert_t);
-                                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                                               softwaretransform(v->v, sv->v);
-                               }
-                               else
-                               {
-                                       m.vertex = &mesh->vertex[0].v[0];
-                                       m.vertexstep = sizeof(surfvertex_t);
-                               }
-                               R_Mesh_Draw(&m);
-                       }
-               }
-       }
-       if (skyrenderglquake)
-       {
-               for (surf = firstsurf;surf;surf = surf->chain)
-               {
-                       memset(&m, 0, sizeof(m));
-                       m.transparent = false;
-                       m.blendfunc1 = GL_SRC_ALPHA;
-                       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       m.cr = 1;
-                       m.cg = 1;
-                       m.cb = 1;
-                       m.ca = 1;
-                       m.tex[0] = R_GetTexture(alphaskytexture);
-                       m.texcoords[0] = &svert[0].st[0];
-                       m.texcoordstep[0] = sizeof(surfvert_t);
-                       speedscale = cl.time * (16.0/128.0);
-                       speedscale -= (int)speedscale;
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               m.numtriangles = mesh->numtriangles;
-                               m.numverts = mesh->numverts;
-                               m.index = mesh->index;
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       softwaretransform(v->v, sv->v);
-                                       VectorSubtract (sv->v, r_origin, dir);
-                                       // flatten the sphere
-                                       dir[2] *= 3;
-
-                                       number = DotProduct(dir, dir);
-                                       #if SLOWMATH
-                                       length = 3.0f / sqrt(number);
-                                       #else
-                                       *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1);
-                                       length = 3.0f * (length * (1.5f - (number * 0.5f * length * length)));
-                                       #endif
-
-                                       sv->st[0] = speedscale + dir[0] * length;
-                                       sv->st[1] = speedscale + dir[1] * length;
-                               }
-                               R_Mesh_Draw(&m);
-                       }
-               }
-       }
+       if (scale != 1)
+               for (i = 0;i < numverts;i++, c += 4)
+                       VectorScale(c, scale, c);
 }
 
-static int RSurf_Light(int *dlightbits, int numverts)
+static int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits, int numverts, const float *vert, float *color)
 {
-       float           f;
-       int                     i, l, lit = false;
-       rdlight_t       *rd;
-       vec3_t          lightorigin;
-       surfvert_t      *sv;
+       float f;
+       const float *v;
+       float *c;
+       int i, l, lit = false;
+       const rdlight_t *rd;
+       vec3_t lightorigin;
        for (l = 0;l < r_numdlights;l++)
        {
                if (dlightbits[l >> 5] & (1 << (l & 31)))
                {
                        rd = &r_dlight[l];
-                       // FIXME: support softwareuntransform here and make bmodels use hardware transform?
-                       VectorCopy(rd->origin, lightorigin);
-                       for (i = 0, sv = svert;i < numverts;i++, sv++)
+                       Matrix4x4_Transform(matrix, rd->origin, lightorigin);
+                       for (i = 0, v = vert, c = color;i < numverts;i++, v += 4, c += 4)
                        {
-                               f = VectorDistance2(sv->v, lightorigin) + LIGHTOFFSET;
+                               f = VectorDistance2(v, lightorigin) + LIGHTOFFSET;
                                if (f < rd->cullradius2)
                                {
-                                       f = (1.0f / f) - rd->lightsubtract;
-                                       sv->c[0] += rd->light[0] * f;
-                                       sv->c[1] += rd->light[1] * f;
-                                       sv->c[2] += rd->light[2] * f;
+                                       f = (1.0f / f) - rd->subtract;
+                                       VectorMA(c, f, rd->light, c);
                                        lit = true;
                                }
                        }
@@ -673,1182 +730,920 @@ static int RSurf_Light(int *dlightbits, int numverts)
        return lit;
 }
 
-static void RSurfShader_Water_Pass_Base(msurface_t *surf)
+// note: this untransforms lights to do the checking,
+// and takes surf->mesh->verts data
+static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, const surfmesh_t *mesh)
 {
-       int i;
-       float diff[3], alpha, ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-       alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
-
-       memset(&m, 0, sizeof(m));
-       if (alpha != 1 || surf->currenttexture->fogtexture != NULL)
-       {
-               m.transparent = true;
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       }
-       else
-       {
-               m.transparent = false;
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
-       }
-       m.vertex = &svert[0].v[0];
-       m.vertexstep = sizeof(surfvert_t);
-       m.color = &svert[0].c[0];
-       m.colorstep = sizeof(surfvert_t);
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoords[0] = &svert[0].st[0];
-       m.texcoordstep[0] = sizeof(surfvert_t);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       int i, l;
+       const rdlight_t *rd;
+       vec3_t lightorigin;
+       const float *v;
+       for (l = 0;l < r_numdlights;l++)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-               {
-                       softwaretransform(v->v, sv->v);
-                       if (r_waterripple.value)
-                               sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-                       if (surf->flags & SURF_DRAWFULLBRIGHT)
-                       {
-                               sv->c[0] = 1;
-                               sv->c[1] = 1;
-                               sv->c[2] = 1;
-                               sv->c[3] = alpha;
-                       }
-                       else
-                       {
-                               sv->c[0] = 0.5f;
-                               sv->c[1] = 0.5f;
-                               sv->c[2] = 0.5f;
-                               sv->c[3] = alpha;
-                       }
-                       sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                       sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-               }
-               if (surf->dlightframe == r_framecount && !(surf->flags & SURF_DRAWFULLBRIGHT))
-                       RSurf_Light(surf->dlightbits, m.numverts);
-               if (fogenabled && (surf->flags & SURF_DRAWNOALPHA))
+               if (dlightbits[l >> 5] & (1 << (l & 31)))
                {
-                       for (i = 0, sv = svert;i < m.numverts;i++, sv++)
-                       {
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] *= ifog;
-                               sv->c[1] *= ifog;
-                               sv->c[2] *= ifog;
-                       }
+                       rd = &r_dlight[l];
+                       Matrix4x4_Transform(matrix, rd->origin, lightorigin);
+                       for (i = 0, v = mesh->verts;i < mesh->numverts;i++, v += 4)
+                               if (VectorDistance2(v, lightorigin) < rd->cullradius2)
+                                       return true;
                }
-               R_Mesh_Draw(&m);
        }
+       return false;
 }
 
-static void RSurfShader_Water_Pass_Glow(msurface_t *surf)
+static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture)
 {
-       int i;
-       float diff[3], alpha, ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-       alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
 
-       memset(&m, 0, sizeof(m));
-       m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.vertex = &svert[0].v[0];
-       m.vertexstep = sizeof(surfvert_t);
-       m.cr = 1;
-       m.cg = 1;
-       m.cb = 1;
-       m.ca = alpha;
-       m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
-       m.texcoords[0] = &svert[0].st[0];
-       m.texcoordstep[0] = sizeof(surfvert_t);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       // LordHavoc: HalfLife maps have freaky skypolys...
+       if (ent->model->ishlbsp)
+               return;
+
+       if (skyrendernow)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               if (fogenabled)
-               {
-                       m.color = &svert[0].c[0];
-                       m.colorstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                       {
-                               softwaretransform(v->v, sv->v);
-                               if (r_waterripple.value)
-                                       sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-                               sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                               sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = m.cr * ifog;
-                               sv->c[1] = m.cg * ifog;
-                               sv->c[2] = m.cb * ifog;
-                               sv->c[3] = m.ca;
-                       }
-               }
-               else
-               {
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                       {
-                               softwaretransform(v->v, sv->v);
-                               if (r_waterripple.value)
-                                       sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-                               sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                               sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                       }
-               }
-               R_Mesh_Draw(&m);
+               skyrendernow = false;
+               if (skyrendermasked)
+                       R_Sky();
        }
-}
 
-static void RSurfShader_Water_Pass_Fog(msurface_t *surf)
-{
-       int i;
-       float alpha;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-       vec3_t diff;
-       alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
+       R_Mesh_Matrix(&ent->matrix);
 
+       // draw depth-only polys
        memset(&m, 0, sizeof(m));
-       m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.vertex = &svert[0].v[0];
-       m.vertexstep = sizeof(surfvert_t);
-       m.color = &svert[0].c[0];
-       m.colorstep = sizeof(surfvert_t);
-       m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
-       m.texcoords[0] = &svert[0].st[0];
-       m.texcoordstep[0] = sizeof(surfvert_t);
-
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       if (skyrendermasked)
+       {
+               qglColorMask(0,0,0,0);
+               // just to make sure that braindead drivers don't draw anything
+               // despite that colormask...
+               m.blendfunc1 = GL_ZERO;
+               m.blendfunc2 = GL_ONE;
+       }
+       else
+       {
+               // fog sky
+               m.blendfunc1 = GL_ONE;
+               m.blendfunc2 = GL_ZERO;
+       }
+       m.depthwrite = true;
+       R_Mesh_State(&m);
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                {
-                       softwaretransform(v->v, sv->v);
-                       if (r_waterripple.value)
-                               sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-                       if (m.tex[0])
-                       {
-                               sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                               sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                       }
-                       VectorSubtract(sv->v, r_origin, diff);
-                       sv->c[0] = fogcolor[0];
-                       sv->c[1] = fogcolor[1];
-                       sv->c[2] = fogcolor[2];
-                       sv->c[3] = alpha * exp(fogdensity/DotProduct(diff, diff));
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_colorscale, 1);
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
                }
-               R_Mesh_Draw(&m);
        }
+       qglColorMask(1,1,1,1);
 }
 
-static void RSurfShader_Water(msurface_t *firstsurf)
+static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 {
-       msurface_t *surf;
-       for (surf = firstsurf;surf;surf = surf->chain)
-               RSurfShader_Water_Pass_Base(surf);
-       for (surf = firstsurf;surf;surf = surf->chain)
-               if (surf->currenttexture->glowtexture)
-                       RSurfShader_Water_Pass_Glow(surf);
-       if (fogenabled)
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       RSurfShader_Water_Pass_Fog(surf);
-}
+       const entity_render_t *ent = calldata1;
+       const msurface_t *surf = ent->model->surfaces + calldata2;
+       float f, colorscale;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
+       float modelorg[3];
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
 
-static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *surf)
-{
-       int i;
-       float diff[3], ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
+       R_Mesh_Matrix(&ent->matrix);
 
        memset(&m, 0, sizeof(m));
-       if (currentrenderentity->effects & EF_ADDITIVE)
+       if (ent->effects & EF_ADDITIVE)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE;
        }
-       else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
+       else if (surf->currenttexture->fogtexture != NULL || alpha < 1)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        }
        else
        {
-               m.transparent = false;
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.cr = m.cg = m.cb = (float) (1 << lightscalebit);
-       m.ca = currentrenderentity->alpha;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.tex[1] = R_GetTexture(surf->lightmaptexture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
-       m.texcoordstep[1] = sizeof(surfvertex_t);
+       colorscale = r_colorscale;
+       if (gl_combine.integer)
+       {
+               m.texrgbscale[0] = 4;
+               colorscale *= 0.25f;
+       }
+       R_Mesh_State(&m);
+       GL_UseColorArray();
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->st[0];
-               m.texcoords[1] = &mesh->vertex->uv[0];
-               if (fogenabled)
-               {
-                       m.color = &svert[0].c[0];
-                       m.colorstep = sizeof(surfvert_t);
-                       if (softwaretransform_complexity)
-                       {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       softwaretransform(v->v, sv->v);
-                                       VectorSubtract(sv->v, r_origin, diff);
-                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                       sv->c[0] = m.cr * ifog;
-                                       sv->c[1] = m.cg * ifog;
-                                       sv->c[2] = m.cb * ifog;
-                                       sv->c[3] = m.ca;
-                               }
-                       }
-                       else
-                       {
-                               m.vertex = &mesh->vertex->v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       VectorSubtract(v->v, r_origin, diff);
-                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                       sv->c[0] = m.cr * ifog;
-                                       sv->c[1] = m.cg * ifog;
-                                       sv->c[2] = m.cb * ifog;
-                                       sv->c[3] = m.ca;
-                               }
-                       }
-               }
-               else
+               R_Mesh_ResizeCheck(mesh->numverts);
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+               f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f);
+               R_FillColors(varray_color, mesh->numverts, f, f, f, alpha);
+               if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT))
                {
-                       if (softwaretransform_complexity)
-                       {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                                       softwaretransform(v->v, sv->v);
-                       }
-                       else
-                       {
-                               m.vertex = &mesh->vertex->v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
-                       }
+                       if (surf->dlightframe == r_framecount)
+                               RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color);
+                       if (surf->flags & SURF_LIGHTMAP)
+                               RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, varray_color, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
                }
-               R_Mesh_Draw(&m);
+               RSurf_FogColors(varray_vertex, varray_color, colorscale, mesh->numverts, modelorg);
+               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
        }
-}
-
-static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
 
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_ONE;
-       m.blendfunc2 = GL_ZERO;
-       m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer);
-       m.ca = 1;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       if (fogenabled)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->st[0];
-               if (softwaretransform_complexity)
-               {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               softwaretransform(v->v, sv->v);
-               }
-               else
+               memset(&m, 0, sizeof(m));
+               m.blendfunc1 = GL_SRC_ALPHA;
+               m.blendfunc2 = GL_ONE;
+               m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
+               R_Mesh_State(&m);
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                {
-                       m.vertex = &mesh->vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       if (m.tex[0])
+                               memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+                       RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, r_colorscale, mesh->numverts, modelorg);
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
                }
-               R_Mesh_Draw(&m);
        }
 }
 
-static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *surf)
+static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture)
 {
-       int i;
-       float diff[3], ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_ZERO;
-       m.blendfunc2 = GL_SRC_COLOR;
-       m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer);
-       m.ca = 1;
-       m.tex[0] = R_GetTexture(surf->lightmaptexture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       const msurface_t *surf;
+       vec3_t center;
+       if ((r_wateralpha.value < 1 && !(texture->flags & SURF_DRAWNOALPHA)) || ent->effects & EF_ADDITIVE || texture->fogtexture)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->uv[0];
-               if (fogenabled)
-               {
-                       m.color = &svert[0].c[0];
-                       m.colorstep = sizeof(surfvert_t);
-                       if (softwaretransform_complexity)
-                       {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       softwaretransform(v->v, sv->v);
-                                       VectorSubtract(sv->v, r_origin, diff);
-                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                       sv->c[0] = m.cr * ifog;
-                                       sv->c[1] = m.cg * ifog;
-                                       sv->c[2] = m.cb * ifog;
-                                       sv->c[3] = m.ca;
-                               }
-                       }
-                       else
-                       {
-                               m.vertex = &mesh->vertex->v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       VectorSubtract(v->v, r_origin, diff);
-                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                       sv->c[0] = m.cr * ifog;
-                                       sv->c[1] = m.cg * ifog;
-                                       sv->c[2] = m.cb * ifog;
-                                       sv->c[3] = m.ca;
-                               }
-                       }
-               }
-               else
+               for (surf = texture->surfacechain;surf;surf = surf->texturechain)
                {
-                       if (softwaretransform_complexity)
-                       {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                                       softwaretransform(v->v, sv->v);
-                       }
-                       else
-                       {
-                               m.vertex = &mesh->vertex->v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
-                       }
+                       Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+                       R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces);
                }
-               R_Mesh_Draw(&m);
        }
+       else
+               for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+                       RSurfShader_Water_Callback(ent, surf - ent->model->surfaces);
 }
 
-static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf)
+static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf)
 {
-       int i, size3;
-       float c[3], base[3], scale, diff[3], ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-       qbyte *lm;
-
-       size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3;
-
-       base[0] = base[1] = base[2] = r_ambient.value * (1.0f / 128.0f);
-
+       float base, colorscale;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       float modelorg[3];
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
        memset(&m, 0, sizeof(m));
-       if (currentrenderentity->effects & EF_ADDITIVE)
+       if (ent->effects & EF_ADDITIVE)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE;
        }
-       else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
+       else if (surf->currenttexture->fogtexture != NULL || ent->alpha < 1)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        }
        else
        {
-               m.transparent = false;
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.vertex = &svert[0].v[0];
-       m.vertexstep = sizeof(surfvert_t);
-       m.color = &svert[0].c[0];
-       m.colorstep = sizeof(surfvert_t);
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
+       colorscale = r_colorscale;
+       if (gl_combine.integer)
+       {
+               m.texrgbscale[0] = 4;
+               colorscale *= 0.25f;
+       }
+       base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f);
+       R_Mesh_State(&m);
+       GL_UseColorArray();
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->st[0];
-               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-               {
-                       softwaretransform(v->v, sv->v);
-                       VectorCopy(base, c);
-                       if (surf->styles[0] != 255)
-                       {
-                               lm = surf->samples + v->lightmapoffset;
-                               scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f);
-                               VectorMA(c, scale, lm, c);
-                               if (surf->styles[1] != 255)
-                               {
-                                       lm += size3;
-                                       scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f);
-                                       VectorMA(c, scale, lm, c);
-                                       if (surf->styles[2] != 255)
-                                       {
-                                               lm += size3;
-                                               scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f);
-                                               VectorMA(c, scale, lm, c);
-                                               if (surf->styles[3] != 255)
-                                               {
-                                                       lm += size3;
-                                                       scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f);
-                                                       VectorMA(c, scale, lm, c);
-                                               }
-                                       }
-                               }
-                       }
-                       sv->c[0] = c[0];
-                       sv->c[1] = c[1];
-                       sv->c[2] = c[2];
-                       sv->c[3] = currentrenderentity->alpha;
-               }
-               if (surf->dlightframe == r_framecount)
-                       RSurf_Light(surf->dlightbits, m.numverts);
-               if (fogenabled)
+               R_Mesh_ResizeCheck(mesh->numverts);
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+               R_FillColors(varray_color, mesh->numverts, base, base, base, ent->alpha);
+               if (!(ent->effects & EF_FULLBRIGHT))
                {
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                       {
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] *= ifog;
-                               sv->c[1] *= ifog;
-                               sv->c[2] *= ifog;
-                       }
+                       if (surf->dlightframe == r_framecount)
+                               RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color);
+                       if (surf->flags & SURF_LIGHTMAP)
+                               RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, varray_color, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
                }
-               R_Mesh_Draw(&m);
+               RSurf_FogColors(varray_vertex, varray_color, colorscale, mesh->numverts, modelorg);
+               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
        }
 }
 
-static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *surf)
+static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, const msurface_t *surf)
 {
-       int i;
-       float diff[3], ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       float modelorg[3];
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
        memset(&m, 0, sizeof(m));
-       if (currentrenderentity->effects & EF_ADDITIVE)
+       if (ent->effects & EF_ADDITIVE)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE;
        }
-       else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
+       else if (surf->currenttexture->fogtexture != NULL || ent->alpha < 1)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        }
        else
        {
-               m.transparent = false;
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.vertex = &svert[0].v[0];
-       m.vertexstep = sizeof(surfvert_t);
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
+       R_Mesh_State(&m);
+       GL_UseColorArray();
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->st[0];
-               if (fogenabled)
-               {
-                       m.color = &svert[0].c[0];
-                       m.colorstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                       {
-                               softwaretransform(v->v, sv->v);
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = ifog;
-                               sv->c[1] = ifog;
-                               sv->c[2] = ifog;
-                               sv->c[3] = currentrenderentity->alpha;
-                       }
-               }
-               else
-               {
-                       m.cr = m.cg = m.cb = 1;
-                       m.ca = currentrenderentity->alpha;
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               softwaretransform(v->v, sv->v);
-               }
-               R_Mesh_Draw(&m);
+               R_Mesh_ResizeCheck(mesh->numverts);
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+               RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, ent->alpha, r_colorscale, mesh->numverts, modelorg);
+               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
        }
 }
 
-static void RSurfShader_Wall_Pass_Light(msurface_t *surf)
+static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf)
 {
-       int i;
-       float diff[3], ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       float modelorg[3];
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
        memset(&m, 0, sizeof(m));
-       if (currentrenderentity->effects & EF_ADDITIVE)
-               m.transparent = true;
-       else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
-               m.transparent = true;
-       else
-               m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.vertex = &svert[0].v[0];
-       m.vertexstep = sizeof(surfvert_t);
-       m.color = &svert[0].c[0];
-       m.colorstep = sizeof(surfvert_t);
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
+       m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
+       R_Mesh_State(&m);
+       GL_UseColorArray();
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->st[0];
-               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-               {
-                       softwaretransform(v->v, sv->v);
-                       sv->c[0] = 0;
-                       sv->c[1] = 0;
-                       sv->c[2] = 0;
-                       sv->c[3] = currentrenderentity->alpha;
-               }
-               if (RSurf_Light(surf->dlightbits, m.numverts))
-               {
-                       if (fogenabled)
-                       {
-                               for (i = 0, sv = svert;i < m.numverts;i++, sv++)
-                               {
-                                       VectorSubtract(sv->v, r_origin, diff);
-                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                       sv->c[0] *= ifog;
-                                       sv->c[1] *= ifog;
-                                       sv->c[2] *= ifog;
-                               }
-                       }
-                       R_Mesh_Draw(&m);
-               }
+               R_Mesh_ResizeCheck(mesh->numverts);
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+               RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, ent->alpha, r_colorscale, mesh->numverts, modelorg);
+               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
        }
 }
 
-static void RSurfShader_Wall_Pass_Glow(msurface_t *surf)
+static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf)
 {
-       int i;
-       float diff[3], ifog;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       surfmesh_t *mesh;
-       rmeshinfo_t m;
-
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       float modelorg[3];
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
        memset(&m, 0, sizeof(m));
-       if (currentrenderentity->effects & EF_ADDITIVE)
-               m.transparent = true;
-       else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
-               m.transparent = true;
-       else
-               m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.cr = 1;
-       m.cg = 1;
-       m.cb = 1;
-       m.ca = currentrenderentity->alpha;
-       m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
+       m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
+       R_Mesh_State(&m);
+       GL_UseColorArray();
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->st[0];
-               if (fogenabled)
+               R_Mesh_ResizeCheck(mesh->numverts);
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               if (m.tex[0])
+                       memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+               RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha, r_colorscale, mesh->numverts, modelorg);
+               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+       }
+}
+
+static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture)
+{
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       int lightmaptexturenum;
+       float cl;
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_ONE;
+       m.blendfunc2 = GL_ZERO;
+       m.tex[0] = R_GetTexture(texture->texture);
+       m.tex[1] = R_GetTexture(texture->surfacechain->lightmaptexture);
+       m.tex[2] = R_GetTexture(texture->detailtexture);
+       m.texrgbscale[0] = 1;
+       m.texrgbscale[1] = 4;
+       m.texrgbscale[2] = 2;
+       R_Mesh_State(&m);
+       cl = (float) (1 << r_lightmapscalebit) * r_colorscale;
+       GL_Color(cl, cl, cl, 1);
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+       {
+               lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+               if (m.tex[1] != lightmaptexturenum)
                {
-                       m.color = &svert[0].c[0];
-                       m.colorstep = sizeof(surfvert_t);
-                       if (softwaretransform_complexity)
-                       {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       softwaretransform(v->v, sv->v);
-                                       VectorSubtract(sv->v, r_origin, diff);
-                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                       sv->c[0] = m.cr * ifog;
-                                       sv->c[1] = m.cg * ifog;
-                                       sv->c[2] = m.cb * ifog;
-                                       sv->c[3] = m.ca;
-                               }
-                       }
-                       else
-                       {
-                               m.vertex = &mesh->vertex->v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                               {
-                                       VectorSubtract(v->v, r_origin, diff);
-                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                       sv->c[0] = m.cr * ifog;
-                                       sv->c[1] = m.cg * ifog;
-                                       sv->c[2] = m.cb * ifog;
-                                       sv->c[3] = m.ca;
-                               }
-                       }
+                       m.tex[1] = lightmaptexturenum;
+                       R_Mesh_State(&m);
                }
-               else
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                {
-                       if (softwaretransform_complexity)
-                       {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                                       softwaretransform(v->v, sv->v);
-                       }
-                       else
-                       {
-                               m.vertex = &mesh->vertex->v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
-                       }
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+                       memcpy(varray_texcoord[1], mesh->uv, mesh->numverts * sizeof(float[2]));
+                       memcpy(varray_texcoord[2], mesh->ab, mesh->numverts * sizeof(float[2]));
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
                }
-               R_Mesh_Draw(&m);
        }
 }
 
-static void RSurfShader_Wall_Pass_Fog(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture)
 {
-       int i;
-       surfvertex_t *v;
-       surfvert_t *sv;
-       rmeshinfo_t m;
-       surfmesh_t *mesh;
-       vec3_t diff;
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       int lightmaptexturenum;
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_ONE;
+       m.blendfunc2 = GL_ZERO;
+       m.tex[0] = R_GetTexture(texture->texture);
+       m.tex[1] = R_GetTexture(texture->surfacechain->lightmaptexture);
+       if (gl_combine.integer)
+               m.texrgbscale[1] = 4;
+       R_Mesh_State(&m);
+       GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+       {
+               lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+               if (m.tex[1] != lightmaptexturenum)
+               {
+                       m.tex[1] = lightmaptexturenum;
+                       R_Mesh_State(&m);
+               }
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+               {
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+                       memcpy(varray_texcoord[1], mesh->uv, mesh->numverts * sizeof(float[2]));
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+               }
+       }
+}
+
+static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture)
+{
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_ONE;
+       m.blendfunc2 = GL_ZERO;
+       m.tex[0] = R_GetTexture(texture->texture);
+       R_Mesh_State(&m);
+       GL_Color(1, 1, 1, 1);
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+       {
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+               {
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+               }
+       }
+}
+
+static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture)
+{
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       int lightmaptexturenum;
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_ZERO;
+       m.blendfunc2 = GL_SRC_COLOR;
+       m.tex[0] = R_GetTexture(texture->surfacechain->lightmaptexture);
+       if (gl_combine.integer)
+               m.texrgbscale[0] = 4;
+       R_Mesh_State(&m);
+       GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+       {
+               lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+               if (m.tex[0] != lightmaptexturenum)
+               {
+                       m.tex[0] = lightmaptexturenum;
+                       R_Mesh_State(&m);
+               }
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+               {
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       memcpy(varray_texcoord[0], mesh->uv, mesh->numverts * sizeof(float[2]));
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+               }
+       }
+}
+
+static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const texture_t *texture)
+{
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       float colorscale;
+       rmeshstate_t m;
 
        memset(&m, 0, sizeof(m));
-       if (currentrenderentity->effects & EF_ADDITIVE)
-               m.transparent = true;
-       else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
-               m.transparent = true;
-       else
-               m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.color = &svert[0].c[0];
-       m.colorstep = sizeof(surfvert_t);
-       m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
-       m.texcoordstep[0] = sizeof(surfvertex_t);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       m.tex[0] = R_GetTexture(texture->texture);
+       colorscale = r_colorscale;
+       if (gl_combine.integer)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               m.index = mesh->index;
-               m.texcoords[0] = &mesh->vertex->st[0];
-               if (softwaretransform_complexity)
+               m.texrgbscale[0] = 4;
+               colorscale *= 0.25f;
+       }
+       R_Mesh_State(&m);
+       GL_UseColorArray();
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+       {
+               if (surf->dlightframe == r_framecount)
                {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                        {
-                               softwaretransform(v->v, sv->v);
-                               VectorSubtract(sv->v, r_origin, diff);
-                               sv->c[0] = fogcolor[0];
-                               sv->c[1] = fogcolor[1];
-                               sv->c[2] = fogcolor[2];
-                               sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff));
+                               if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh))
+                               {
+                                       R_Mesh_ResizeCheck(mesh->numverts);
+                                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                                       memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+                                       R_FillColors(varray_color, mesh->numverts, 0, 0, 0, 1);
+                                       RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color);
+                                       RSurf_ScaleColors(varray_color, colorscale, mesh->numverts);
+                                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+                               }
                        }
                }
-               else
+       }
+}
+
+static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture)
+{
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       float modelorg[3];
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_SRC_ALPHA;
+       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+       R_Mesh_State(&m);
+       GL_UseColorArray();
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+       {
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                {
-                       m.vertex = &mesh->vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
-                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
-                       {
-                               VectorSubtract(v->v, r_origin, diff);
-                               sv->c[0] = fogcolor[0];
-                               sv->c[1] = fogcolor[1];
-                               sv->c[2] = fogcolor[2];
-                               sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff));
-                       }
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       if (m.tex[0])
+                               memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+                       RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], 1, r_colorscale, mesh->numverts, modelorg);
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
                }
-               R_Mesh_Draw(&m);
        }
 }
 
-static void RSurfShader_Wall_Fullbright(msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture)
 {
-       msurface_t *surf;
-       for (surf = firstsurf;surf;surf = surf->chain)
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_DST_COLOR;
+       m.blendfunc2 = GL_SRC_COLOR;
+       m.tex[0] = R_GetTexture(texture->detailtexture);
+       R_Mesh_State(&m);
+       GL_Color(1, 1, 1, 1);
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
        {
-               c_brush_polys++;
-               RSurfShader_Wall_Pass_BaseFullbright(surf);
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+               {
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       memcpy(varray_texcoord[0], mesh->ab, mesh->numverts * sizeof(float[2]));
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+               }
        }
-       for (surf = firstsurf;surf;surf = surf->chain)
-               if (surf->currenttexture->glowtexture)
-                       RSurfShader_Wall_Pass_Glow(surf);
-       if (fogenabled)
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       RSurfShader_Wall_Pass_Fog(surf);
 }
 
-static void RSurfShader_Wall_Vertex(msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture)
 {
-       msurface_t *surf;
-       for (surf = firstsurf;surf;surf = surf->chain)
+       const msurface_t *surf;
+       const surfmesh_t *mesh;
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_SRC_ALPHA;
+       m.blendfunc2 = GL_ONE;
+       m.tex[0] = R_GetTexture(texture->glowtexture);
+       R_Mesh_State(&m);
+       GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
        {
-               c_brush_polys++;
-               RSurfShader_Wall_Pass_BaseVertex(surf);
+               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+               {
+                       R_Mesh_ResizeCheck(mesh->numverts);
+                       memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                       memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+               }
        }
-       for (surf = firstsurf;surf;surf = surf->chain)
-               if (surf->currenttexture->glowtexture)
-                       RSurfShader_Wall_Pass_Glow(surf);
+}
+
+static void RSurfShader_Wall_Fullbright_Callback(const void *calldata1, int calldata2)
+{
+       const entity_render_t *ent = calldata1;
+       const msurface_t *surf = ent->model->surfaces + calldata2;
+       R_Mesh_Matrix(&ent->matrix);
+       RSurfShader_Wall_Pass_BaseFullbright(ent, surf);
+       if (surf->currenttexture->glowtexture)
+               RSurfShader_Wall_Pass_Glow(ent, surf);
        if (fogenabled)
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       RSurfShader_Wall_Pass_Fog(surf);
+               RSurfShader_Wall_Pass_Fog(ent, surf);
 }
 
-static void RSurfShader_Wall_Lightmap(msurface_t *firstsurf)
+static void RSurfShader_Wall_Fullbright(const entity_render_t *ent, const texture_t *texture)
 {
-       msurface_t *surf;
-       if (r_vertexsurfaces.integer)
+       const msurface_t *surf;
+       vec3_t center;
+       if (ent->effects & EF_ADDITIVE || ent->alpha < 1 || texture->fogtexture != NULL)
        {
-               for (surf = firstsurf;surf;surf = surf->chain)
+               for (surf = texture->surfacechain;surf;surf = surf->texturechain)
                {
-                       c_brush_polys++;
-                       RSurfShader_Wall_Pass_BaseVertex(surf);
+                       Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+                       R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces);
                }
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       if (surf->currenttexture->glowtexture)
-                               RSurfShader_Wall_Pass_Glow(surf);
+       }
+       else
+       {
+               for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+                       RSurfShader_Wall_Pass_BaseFullbright(ent, surf);
+               if (texture->glowtexture)
+                       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+                               RSurfShader_Wall_Pass_Glow(ent, surf);
                if (fogenabled)
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               RSurfShader_Wall_Pass_Fog(surf);
+                       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+                               RSurfShader_Wall_Pass_Fog(ent, surf);
        }
-       else if (r_multitexture.integer)
+}
+
+static void RSurfShader_Wall_Vertex_Callback(const void *calldata1, int calldata2)
+{
+       const entity_render_t *ent = calldata1;
+       const msurface_t *surf = ent->model->surfaces + calldata2;
+       R_Mesh_Matrix(&ent->matrix);
+       RSurfShader_Wall_Pass_BaseVertex(ent, surf);
+       if (surf->currenttexture->glowtexture)
+               RSurfShader_Wall_Pass_Glow(ent, surf);
+       if (fogenabled)
+               RSurfShader_Wall_Pass_Fog(ent, surf);
+}
+
+static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_t *texture)
+{
+       const msurface_t *surf;
+       vec3_t center;
+       if (ent->effects & EF_ADDITIVE || ent->alpha < 1 || texture->fogtexture != NULL)
        {
-               if (r_dlightmap.integer)
-               {
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                       {
-                               c_brush_polys++;
-                               RSurfShader_Wall_Pass_BaseMTex(surf);
-                       }
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               if (surf->currenttexture->glowtexture)
-                                       RSurfShader_Wall_Pass_Glow(surf);
-                       if (fogenabled)
-                               for (surf = firstsurf;surf;surf = surf->chain)
-                                       RSurfShader_Wall_Pass_Fog(surf);
-               }
-               else
+               // transparent vertex shaded from lightmap
+               for (surf = texture->surfacechain;surf;surf = surf->texturechain)
                {
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                       {
-                               c_brush_polys++;
-                               RSurfShader_Wall_Pass_BaseMTex(surf);
-                       }
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               if (surf->dlightframe == r_framecount)
-                                       RSurfShader_Wall_Pass_Light(surf);
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               if (surf->currenttexture->glowtexture)
-                                       RSurfShader_Wall_Pass_Glow(surf);
-                       if (fogenabled)
-                               for (surf = firstsurf;surf;surf = surf->chain)
-                                       RSurfShader_Wall_Pass_Fog(surf);
+                       Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+                       R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
                }
        }
-       else if (firstsurf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE)
+       else if (r_vertexsurfaces.integer)
        {
-               for (surf = firstsurf;surf;surf = surf->chain)
-               {
-                       c_brush_polys++;
-                       RSurfShader_Wall_Pass_BaseVertex(surf);
-               }
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       if (surf->currenttexture->glowtexture)
-                               RSurfShader_Wall_Pass_Glow(surf);
+               // opaque vertex shaded from lightmap
+               for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+                       RSurfShader_Wall_Pass_BaseVertex(ent, surf);
+               if (texture->glowtexture)
+                       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+                               RSurfShader_Wall_Pass_Glow(ent, surf);
                if (fogenabled)
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               RSurfShader_Wall_Pass_Fog(surf);
+                       for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+                               RSurfShader_Wall_Pass_Fog(ent, surf);
        }
        else
        {
-               if (r_dlightmap.integer)
+               // opaque lightmapped
+               if (r_textureunits.integer >= 2)
                {
-                       for (surf = firstsurf;surf;surf = surf->chain)
+                       if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer)
+                               RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture);
+                       else
                        {
-                               c_brush_polys++;
-                               RSurfShader_Wall_Pass_BaseTexture(surf);
+                               RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture);
+                               if (r_detailtextures.integer)
+                                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture);
                        }
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               RSurfShader_Wall_Pass_BaseLightmap(surf);
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               if (surf->currenttexture->glowtexture)
-                                       RSurfShader_Wall_Pass_Glow(surf);
-                       if (fogenabled)
-                               for (surf = firstsurf;surf;surf = surf->chain)
-                                       RSurfShader_Wall_Pass_Fog(surf);
                }
                else
                {
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                       {
-                               c_brush_polys++;
-                               RSurfShader_Wall_Pass_BaseTexture(surf);
-                       }
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               RSurfShader_Wall_Pass_BaseLightmap(surf);
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               if (surf->dlightframe == r_framecount)
-                                       RSurfShader_Wall_Pass_Light(surf);
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               if (surf->currenttexture->glowtexture)
-                                       RSurfShader_Wall_Pass_Glow(surf);
-                       if (fogenabled)
-                               for (surf = firstsurf;surf;surf = surf->chain)
-                                       RSurfShader_Wall_Pass_Fog(surf);
+                       RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture);
+                       RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture);
+                       if (r_detailtextures.integer)
+                               RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture);
                }
+               if (!r_dlightmap.integer && !(ent->effects & EF_FULLBRIGHT))
+                       RSurfShader_OpaqueWall_Pass_Light(ent, texture);
+               if (texture->glowtexture)
+                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture);
+               if (fogenabled)
+                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture);
        }
 }
 
-/*
-=============================================================
-
-       WORLD MODEL
-
-=============================================================
-*/
+Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, SHADERFLAGS_NEEDLIGHTMAP};
+Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, 0};
+Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, 0};
+Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, 0};
 
-static void RSurf_Callback(void *data, void *junk)
+int Cshader_count = 4;
+Cshader_t *Cshaders[4] =
 {
-       ((msurface_t *)data)->visframe = r_framecount;
-}
+       &Cshader_wall_lightmap,
+       &Cshader_wall_fullbright,
+       &Cshader_water,
+       &Cshader_sky
+};
 
-static void R_SolidWorldNode (void)
+void R_DrawSurfaces(entity_render_t *ent, int sky, int normal)
 {
-       if (r_viewleaf->contents != CONTENTS_SOLID)
-       {
-               int portalstack;
-               mportal_t *p, *pstack[8192];
-               msurface_t *surf, **mark, **endmark;
-               mleaf_t *leaf;
-               tinyplane_t plane;
-               // LordHavoc: portal-passage worldnode; follows portals leading
-               // outward from viewleaf, if a portal leads offscreen it is not
-               // followed, in indoor maps this can often cull a great deal of
-               // geometry away when pvs data is not present (useful with pvs as well)
-
-               leaf = r_viewleaf;
-               leaf->worldnodeframe = r_framecount;
-               portalstack = 0;
-       loc0:
-               c_leafs++;
+       int i, alttextures, texframe, framecount, numtextures, numsurfaces, *surfacevisframes;
+       texture_t *t, *textures;
+       model_t *model;
+       msurface_t *surf, *surfaces;
+       vec3_t modelorg;
 
-               leaf->visframe = r_framecount;
+       if (!ent->model)
+               return;
 
-               if (leaf->nummarksurfaces)
+       // mark the surfaces touched by dynamic lights
+       if (normal && r_dynamic.integer)
+               R_MarkLights(ent);
+
+       R_Mesh_Matrix(&ent->matrix);
+
+       model = ent->model;
+       alttextures = ent->frame != 0;
+       texframe = (int)(cl.time * 5.0f);
+
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+
+       numtextures = model->numtextures;
+       textures = model->textures;
+       numsurfaces = model->nummodelsurfaces;
+       surfaces = model->surfaces + model->firstmodelsurface;
+       surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
+
+       for (i = 0;i < numtextures;i++)
+               textures[i].surfacechain = NULL;
+
+       for (i = 0, surf = surfaces;i < numsurfaces;i++, surf++)
+       {
+               if (surfacevisframes[i] == r_framecount)
                {
-                       mark = leaf->firstmarksurface;
-                       endmark = mark + leaf->nummarksurfaces;
-                       if (r_ser.integer)
+#if !WORLDNODECULLBACKFACES
+                       // mark any backface surfaces as not visible
+                       if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
                        {
-                               do
-                               {
-                                       surf = *mark++;
-                                       // make sure surfaces are only processed once
-                                       if (surf->worldnodeframe == r_framecount)
-                                               continue;
-                                       surf->worldnodeframe = r_framecount;
-                                       if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
-                                       {
-                                               if (surf->flags & SURF_PLANEBACK)
-                                               {
-                                                       VectorNegate(surf->plane->normal, plane.normal);
-                                                       plane.dist = -surf->plane->dist;
-                                                       R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane);
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if (!(surf->flags & SURF_PLANEBACK))
-                                                       R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane);
-                                       }
-                               }
-                               while (mark < endmark);
+                               if (!(surf->flags & SURF_PLANEBACK))
+                                       surfacevisframes[i] = -1;
                        }
                        else
                        {
-                               do
+                               if ((surf->flags & SURF_PLANEBACK))
+                                       surfacevisframes[i] = -1;
+                       }
+                       if (surfacevisframes[i] == r_framecount)
+#endif
+                       {
+                               c_faces++;
+                               t = surf->texinfo->texture;
+                               if (t->animated)
                                {
-                                       surf = *mark++;
-                                       // make sure surfaces are only processed once
-                                       if (surf->worldnodeframe == r_framecount)
-                                               continue;
-                                       surf->worldnodeframe = r_framecount;
-                                       if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
-                                       {
-                                               if (surf->flags & SURF_PLANEBACK)
-                                                       surf->visframe = r_framecount;
-                                       }
+                                       framecount = t->anim_total[alttextures];
+                                       if (framecount >= 2)
+                                               t = t->anim_frames[alttextures][texframe % framecount];
                                        else
-                                       {
-                                               if (!(surf->flags & SURF_PLANEBACK))
-                                                       surf->visframe = r_framecount;
-                                       }
+                                               t = t->anim_frames[alttextures][0];
                                }
-                               while (mark < endmark);
-                       }
-               }
-
-               // follow portals into other leafs
-               p = leaf->portals;
-               for (;p;p = p->next)
-               {
-                       if (DotProduct(r_origin, p->plane.normal) < p->plane.dist)
-                       {
-                               leaf = p->past;
-                               if (leaf->worldnodeframe != r_framecount)
+                               surf->currenttexture = t;
+                               surf->texturechain = t->surfacechain;
+                               t->surfacechain = surf;
+                               if (!r_vertexsurfaces.integer && surf->lightmaptexture != NULL)
                                {
-                                       leaf->worldnodeframe = r_framecount;
-                                       if (leaf->contents != CONTENTS_SOLID)
+                                       if (surf->cached_dlight
+                                       || surf->cached_ambient != r_ambient.value
+                                       || surf->cached_lightmapscalebit != r_lightmapscalebit)
+                                               R_BuildLightMap(ent, surf, false); // base lighting changed
+                                       else if (r_dynamic.integer)
                                        {
-                                               if (R_NotCulledBox(leaf->mins, leaf->maxs))
-                                               {
-                                                       p->visframe = r_framecount;
-                                                       pstack[portalstack++] = p;
-                                                       goto loc0;
-
-       loc1:
-                                                       p = pstack[--portalstack];
-                                               }
+                                               if  (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0]
+                                               || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
+                                               || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
+                                               || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
+                                                       R_BuildLightMap(ent, surf, false); // base lighting changed
+                                               else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+                                                       R_BuildLightMap(ent, surf, true); // only dlights
                                        }
                                }
                        }
                }
+       }
+
+       if (sky)
+               for (i = 0, t = textures;i < numtextures;i++, t++)
+                       if (t->surfacechain && t->shader->shaderfunc[SHADERSTAGE_SKY])
+                               t->shader->shaderfunc[SHADERSTAGE_SKY](ent, t);
+
+       if (normal)
+               for (i = 0, t = textures;i < numtextures;i++, t++)
+                       if (t->surfacechain && t->shader->shaderfunc[SHADERSTAGE_NORMAL])
+                               t->shader->shaderfunc[SHADERSTAGE_NORMAL](ent, t);
+}
 
-               if (portalstack)
-                       goto loc1;
+static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
+{
+       int i;
+       float *v;
+       rmeshstate_t m;
+       const entity_render_t *ent = calldata1;
+       const mportal_t *portal = ent->model->portals + calldata2;
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_SRC_ALPHA;
+       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+       R_Mesh_Matrix(&ent->matrix);
+       R_Mesh_State(&m);
+       R_Mesh_ResizeCheck(portal->numpoints);
+       i = portal - ent->model->portals;
+       GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f) * r_colorscale,
+                        ((i & 0x0038) >> 3) * (1.0f / 7.0f) * r_colorscale,
+                        ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * r_colorscale,
+                        0.125f);
+       if (PlaneDiff(r_origin, (&portal->plane)) > 0)
+       {
+               for (i = portal->numpoints - 1, v = varray_vertex;i >= 0;i--, v += 4)
+                       VectorCopy(portal->points[i].position, v);
        }
        else
-       {
-               mnode_t *nodestack[8192], *node = cl.worldmodel->nodes;
-               int nodestackpos = 0;
-               // LordHavoc: recursive descending worldnode; if portals are not
-               // available, this is a good last resort, can cull large amounts of
-               // geometry, but is more time consuming than portal-passage and renders
-               // things behind walls
+               for (i = 0, v = varray_vertex;i < portal->numpoints;i++, v += 4)
+                       VectorCopy(portal->points[i].position, v);
+       R_Mesh_Draw(portal->numpoints, portal->numpoints - 2, polygonelements);
+}
+
+static void R_DrawPortals(entity_render_t *ent)
+{
+       int i;
+       mportal_t *portal, *endportal;
+       float temp[3], center[3], f;
+
+       if (r_drawportals.integer < 1)
+               return;
 
-loc2:
-               if (R_NotCulledBox(node->mins, node->maxs))
+       for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++)
+       {
+               if (portal->here->pvsframe == r_pvsframecount || portal->past->pvsframe == r_pvsframecount)
                {
-                       if (node->numsurfaces)
+                       if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
                        {
-                               if (r_ser.integer)
-                               {
-                                       msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces;
-                                       tinyplane_t plane;
-                                       if (PlaneDiff (r_origin, node->plane) < 0)
-                                       {
-                                               for (;surf < surfend;surf++)
-                                               {
-                                                       if (surf->flags & SURF_PLANEBACK)
-                                                       {
-                                                               VectorNegate(surf->plane->normal, plane.normal);
-                                                               plane.dist = -surf->plane->dist;
-                                                               R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, &plane);
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               for (;surf < surfend;surf++)
-                                               {
-                                                       if (!(surf->flags & SURF_PLANEBACK))
-                                                               R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane);
-                                               }
-                                       }
-                               }
-                               else
-                               {
-                                       msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces;
-                                       if (PlaneDiff (r_origin, node->plane) < 0)
-                                       {
-                                               for (;surf < surfend;surf++)
-                                               {
-                                                       if (surf->flags & SURF_PLANEBACK)
-                                                               surf->visframe = r_framecount;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               for (;surf < surfend;surf++)
-                                               {
-                                                       if (!(surf->flags & SURF_PLANEBACK))
-                                                               surf->visframe = r_framecount;
-                                               }
-                                       }
-                               }
+                               VectorClear(temp);
+                               for (i = 0;i < portal->numpoints;i++)
+                                       VectorAdd(temp, portal->points[i].position, temp);
+                               f = ixtable[portal->numpoints];
+                               VectorScale(temp, f, temp);
+                               Matrix4x4_Transform(&ent->matrix, temp, center);
+                               R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->portals);
                        }
+               }
+       }
+}
+
+void R_DrawBrushModel(entity_render_t *ent, int sky, int normal)
+{
+       int i, numsurfaces, *surfacevisframes, *surfacepvsframes;
+       msurface_t *surf;
+       model_t *model;
+#if WORLDNODECULLBACKFACES
+       vec3_t modelorg;
+#endif
 
-                       // recurse down the children
-                       if (node->children[0]->contents >= 0)
+       // because bmodels can be reused, we have to decide which things to render
+       // from scratch every time
+       model = ent->model;
+#if WORLDNODECULLBACKFACES
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+#endif
+       numsurfaces = model->nummodelsurfaces;
+       surf = model->surfaces + model->firstmodelsurface;
+       surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
+       surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface;
+       for (i = 0;i < numsurfaces;i++, surf++)
+       {
+#if WORLDNODECULLBACKFACES
+               // mark any backface surfaces as not visible
+               if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
+               {
+                       if ((surf->flags & SURF_PLANEBACK))
                        {
-                               if (node->children[1]->contents >= 0)
-                               {
-                                       if (nodestackpos < 8192)
-                                               nodestack[nodestackpos++] = node->children[1];
-                                       node = node->children[0];
-                                       goto loc2;
-                               }
-                               else
-                                       ((mleaf_t *)node->children[1])->visframe = r_framecount;
-                               node = node->children[0];
-                               goto loc2;
+                               surfacevisframes[i] = r_framecount;
+                               surfacepvsframes[i] = r_pvsframecount;
                        }
-                       else
+               }
+               else
+               {
+                       if (!(surf->flags & SURF_PLANEBACK))
                        {
-                               ((mleaf_t *)node->children[0])->visframe = r_framecount;
-                               if (node->children[1]->contents >= 0)
-                               {
-                                       node = node->children[1];
-                                       goto loc2;
-                               }
-                               else if (nodestackpos > 0)
-                               {
-                                       ((mleaf_t *)node->children[1])->visframe = r_framecount;
-                                       node = nodestack[--nodestackpos];
-                                       goto loc2;
-                               }
+                               surfacevisframes[i] = r_framecount;
+                               surfacepvsframes[i] = r_pvsframecount;
                        }
                }
-               else if (nodestackpos > 0)
+#else
+               surfacevisframes[i] = r_framecount;
+               surfacepvsframes[i] = r_pvsframecount;
+#endif
+               surf->dlightframe = -1;
+       }
+       R_DrawSurfaces(ent, sky, normal);
+}
+
+void R_SurfaceWorldNode (entity_render_t *ent)
+{
+       int i, numsurfaces, *surfacevisframes, *surfacepvsframes;
+       msurface_t *surfaces, *surf;
+       model_t *model;
+       vec3_t modelorg;
+
+       model = ent->model;
+       numsurfaces = model->nummodelsurfaces;
+       surfaces = model->surfaces + model->firstmodelsurface;
+       surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
+       surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface;
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+
+       for (i = 0, surf = surfaces;i < numsurfaces;i++, surf++)
+       {
+               if (surfacepvsframes[i] == r_pvsframecount)
                {
-                       node = nodestack[--nodestackpos];
-                       goto loc2;
+#if WORLDNODECULLBACKFACES
+                       if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
+                       {
+                               if ((surf->flags & SURF_PLANEBACK) && R_NotCulledBox (surf->poly_mins, surf->poly_maxs))
+                                       surfacevisframes[i] = r_framecount;
+                       }
+                       else
+                       {
+                               if (!(surf->flags & SURF_PLANEBACK) && R_NotCulledBox (surf->poly_mins, surf->poly_maxs))
+                                       surfacevisframes[i] = r_framecount;
+                       }
+#else
+                       if (R_NotCulledBox (surf->poly_mins, surf->poly_maxs))
+                               surfacevisframes[i] = r_framecount;
+#endif
                }
        }
 }
 
-static int r_portalframecount = 0;
-
-static void R_PVSWorldNode()
+/*
+static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 {
        int portalstack, i;
        mportal_t *p, *pstack[8192];
        msurface_t *surf, **mark, **endmark;
        mleaf_t *leaf;
-       tinyplane_t plane;
-       qbyte *worldvis;
-
-       worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel);
-
-       leaf = r_viewleaf;
+       // LordHavoc: portal-passage worldnode with PVS;
+       // follows portals leading outward from viewleaf, does not venture
+       // offscreen or into leafs that are not visible, faster than Quake's
+       // RecursiveWorldNode
+       leaf = viewleaf;
        leaf->worldnodeframe = r_framecount;
        portalstack = 0;
 loc0:
        c_leafs++;
-
-       leaf->visframe = r_framecount;
-
        if (leaf->nummarksurfaces)
        {
-               mark = leaf->firstmarksurface;
-               endmark = mark + leaf->nummarksurfaces;
-               if (r_ser.integer)
+               for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
                {
-                       do
+                       surf = *mark++;
+                       // make sure surfaces are only processed once
+                       if (surf->worldnodeframe != r_framecount)
                        {
-                               surf = *mark++;
-                               // make sure surfaces are only processed once
-                               if (surf->worldnodeframe == r_framecount)
-                                       continue;
-                               surf->worldnodeframe = r_framecount;
-                               if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
-                               {
-                                       if (surf->flags & SURF_PLANEBACK)
-                                       {
-                                               VectorNegate(surf->plane->normal, plane.normal);
-                                               plane.dist = -surf->plane->dist;
-                                               R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane);
-                                       }
-                               }
-                               else
-                               {
-                                       if (!(surf->flags & SURF_PLANEBACK))
-                                               R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane);
-                               }
-                       }
-                       while (mark < endmark);
-               }
-               else
-               {
-                       do
-                       {
-                               surf = *mark++;
-                               // make sure surfaces are only processed once
-                               if (surf->worldnodeframe == r_framecount)
-                                       continue;
                                surf->worldnodeframe = r_framecount;
                                if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
                                {
@@ -1861,274 +1656,293 @@ loc0:
                                                surf->visframe = r_framecount;
                                }
                        }
-                       while (mark < endmark);
                }
        }
-
        // follow portals into other leafs
        for (p = leaf->portals;p;p = p->next)
        {
-               if (DotProduct(r_origin, p->plane.normal) < p->plane.dist)
+               leaf = p->past;
+               if (leaf->worldnodeframe != r_framecount)
                {
-                       leaf = p->past;
-                       if (leaf->worldnodeframe != r_framecount)
+                       leaf->worldnodeframe = r_framecount;
+                       // FIXME: R_NotCulledBox is absolute, should be done relative
+                       if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs))
                        {
-                               leaf->worldnodeframe = r_framecount;
-                               if (leaf->contents != CONTENTS_SOLID)
-                               {
-                                       i = (leaf - cl.worldmodel->leafs) - 1;
-                                       if (worldvis[i>>3] & (1<<(i&7)))
-                                       {
-                                               if (R_NotCulledBox(leaf->mins, leaf->maxs))
-                                               {
-                                                       pstack[portalstack++] = p;
-                                                       goto loc0;
-
+                               p->visframe = r_framecount;
+                               pstack[portalstack++] = p;
+                               goto loc0;
 loc1:
-                                                       p = pstack[--portalstack];
-                                               }
-                                       }
-                               }
+                               p = pstack[--portalstack];
                        }
                }
        }
-
        if (portalstack)
                goto loc1;
 }
+*/
 
-Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex}, NULL};
-Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, NULL};
-Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, NULL};
-Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, NULL};
-Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, NULL};
-
-int Cshader_count = 5;
-Cshader_t *Cshaders[5] =
-{
-       &Cshader_wall_vertex,
-       &Cshader_wall_lightmap,
-       &Cshader_wall_fullbright,
-       &Cshader_water,
-       &Cshader_sky
-};
-
-void R_PrepareSurfaces(void)
+static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 {
-       int i;
-       texture_t *t;
-       model_t *model;
+       int c, leafstackpos, *mark, *surfacevisframes;
+#if WORLDNODECULLBACKFACES
+       int n;
        msurface_t *surf;
-
-       for (i = 0;i < Cshader_count;i++)
-               Cshaders[i]->chain = NULL;
-
-       model = currentrenderentity->model;
-
-       for (i = 0;i < model->nummodelsurfaces;i++)
+#endif
+       mleaf_t *leaf, *leafstack[8192];
+       mportal_t *p;
+       vec3_t modelorg;
+       msurface_t *surfaces;
+       // LordHavoc: portal-passage worldnode with PVS;
+       // follows portals leading outward from viewleaf, does not venture
+       // offscreen or into leafs that are not visible, faster than Quake's
+       // RecursiveWorldNode
+       surfaces = ent->model->surfaces;
+       surfacevisframes = ent->model->surfacevisframes;
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       viewleaf->worldnodeframe = r_framecount;
+       leafstack[0] = viewleaf;
+       leafstackpos = 1;
+       while (leafstackpos)
        {
-               surf = model->modelsortedsurfaces[i];
-               if (surf->visframe == r_framecount)
+               c_leafs++;
+               leaf = leafstack[--leafstackpos];
+               // draw any surfaces bounding this leaf
+               if (leaf->nummarksurfaces)
                {
-                       if (surf->insertframe != r_framecount)
+                       for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
                        {
-                               surf->insertframe = r_framecount;
-                               c_faces++;
-                               t = surf->texinfo->texture;
-                               if (t->alternate_anims != NULL && currentrenderentity->frame)
-                                       t = t->alternate_anims;
-                               if (t->anim_total >= 2)
-                                       t = t->anim_frames[(int)(cl.time * 5.0f) % t->anim_total];
-                               surf->currenttexture = t;
+#if WORLDNODECULLBACKFACES
+                               n = *mark++;
+                               if (surfacevisframes[n] != r_framecount)
+                               {
+                                       surf = surfaces + n;
+                                       if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
+                                       {
+                                               if ((surf->flags & SURF_PLANEBACK))
+                                                       surfacevisframes[n] = r_framecount;
+                                       }
+                                       else
+                                       {
+                                               if (!(surf->flags & SURF_PLANEBACK))
+                                                       surfacevisframes[n] = r_framecount;
+                                       }
+                               }
+#else
+                               surfacevisframes[*mark++] = r_framecount;
+#endif
+                       }
+               }
+               // follow portals into other leafs
+               for (p = leaf->portals;p;p = p->next)
+               {
+                       // LordHavoc: this DotProduct hurts less than a cache miss
+                       // (which is more likely to happen if backflowing through leafs)
+                       if (DotProduct(modelorg, p->plane.normal) < (p->plane.dist + 1))
+                       {
+                               leaf = p->past;
+                               if (leaf->worldnodeframe != r_framecount)
+                               {
+                                       leaf->worldnodeframe = r_framecount;
+                                       // FIXME: R_NotCulledBox is absolute, should be done relative
+                                       if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs))
+                                               leafstack[leafstackpos++] = leaf;
+                               }
                        }
-
-                       surf->chain = surf->shader->chain;
-                       surf->shader->chain = surf;
                }
        }
+       if (r_drawportals.integer)
+               R_DrawPortals(ent);
 }
 
-void R_DrawSurfaces (int type)
-{
-       int                     i;
-       Cshader_t       *shader;
-
-       for (i = 0;i < Cshader_count;i++)
-       {
-               shader = Cshaders[i];
-               if (shader->chain && shader->shaderfunc[type])
-                       shader->shaderfunc[type](shader->chain);
-       }
-}
-
-static float portalpointbuffer[256][3];
-
-void R_DrawPortals(void)
+void R_PVSUpdate (mleaf_t *viewleaf)
 {
-       int drawportals, i;
-       mportal_t *portal, *endportal;
-       mvertex_t *point;
-       rmeshinfo_t m;
-       drawportals = r_drawportals.integer;
+       int i, j, l, c, bits, *surfacepvsframes, *mark;
+       mleaf_t *leaf;
+       qbyte *vis;
 
-       if (drawportals < 1)
+       if (r_pvsviewleaf == viewleaf && r_pvsviewleafnovis == r_novis.integer)
                return;
 
-       memset(&m, 0, sizeof(m));
-       m.transparent = true;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       m.vertex = &portalpointbuffer[0][0];
-       m.vertexstep = sizeof(float[3]);
-       m.ca = 0.125;
-       for (portal = cl.worldmodel->portals, endportal = portal + cl.worldmodel->numportals;portal < endportal;portal++)
+       r_pvsframecount++;
+       r_pvsviewleaf = viewleaf;
+       r_pvsviewleafnovis = r_novis.integer;
+
+       if (viewleaf)
        {
-               if (portal->visframe == r_portalframecount)
+               surfacepvsframes = cl.worldmodel->surfacepvsframes;
+               vis = Mod_LeafPVS (viewleaf, cl.worldmodel);
+               for (j = 0;j < cl.worldmodel->numleafs;j += 8)
                {
-                       if (portal->numpoints <= 256)
+                       bits = *vis++;
+                       if (bits)
                        {
-                               i = portal - cl.worldmodel->portals;
-                               m.cr = ((i & 0x0007) >> 0) * (1.0f / 7.0f);
-                               m.cg = ((i & 0x0038) >> 3) * (1.0f / 7.0f);
-                               m.cb = ((i & 0x01C0) >> 6) * (1.0f / 7.0f);
-                               point = portal->points;
-                               if (PlaneDiff(r_origin, (&portal->plane)) > 0)
-                               {
-                                       for (i = portal->numpoints - 1;i >= 0;i--)
-                                               VectorCopy(point[i].position, portalpointbuffer[i]);
-                               }
-                               else
+                               l = cl.worldmodel->numleafs - j;
+                               if (l > 8)
+                                       l = 8;
+                               for (i = 0;i < l;i++)
                                {
-                                       for (i = 0;i < portal->numpoints;i++)
-                                               VectorCopy(point[i].position, portalpointbuffer[i]);
+                                       if (bits & (1 << i))
+                                       {
+                                               leaf = &cl.worldmodel->leafs[j + i + 1];
+                                               leaf->pvsframe = r_pvsframecount;
+                                               // mark surfaces bounding this leaf as visible
+                                               for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
+                                                       surfacepvsframes[*mark++] = r_pvsframecount;
+                                       }
                                }
-                               R_Mesh_DrawPolygon(&m, portal->numpoints);
                        }
                }
        }
 }
 
-void R_SetupForBModelRendering(void)
+/*
+=============
+R_DrawWorld
+=============
+*/
+void R_DrawWorld (entity_render_t *ent)
 {
-       int                     i;
-       msurface_t      *surf;
-       model_t         *model;
-       vec3_t          modelorg;
-
-       // because bmodels can be reused, we have to decide which things to render
-       // from scratch every time
-
-       model = currentrenderentity->model;
-
-       softwaretransformforentity (currentrenderentity);
-       softwareuntransform(r_origin, modelorg);
-
-       for (i = 0;i < model->nummodelsurfaces;i++)
-       {
-               surf = model->modelsortedsurfaces[i];
-               if (((surf->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, surf->plane) >= 0))
-                       surf->visframe = r_framecount;
-               else
-                       surf->visframe = -1;
-               surf->worldnodeframe = -1;
-               surf->lightframe = -1;
-               surf->dlightframe = -1;
-               surf->insertframe = -1;
-       }
+       mleaf_t *viewleaf;
+       viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel);
+       R_PVSUpdate(viewleaf);
+       if (!viewleaf)
+               return;
+       if (r_surfaceworldnode.integer || viewleaf->contents == CONTENTS_SOLID)
+               R_SurfaceWorldNode (ent);
+       else
+               R_PortalWorldNode (ent, viewleaf);
+       R_DrawSurfaces(ent, true, true);
 }
 
-void R_SetupForWorldRendering(void)
+/*
+=================
+R_DrawBrushModel
+=================
+*/
+void R_DrawBrushModelSky (entity_render_t *ent)
 {
-       // there is only one instance of the world, but it can be rendered in
-       // multiple stages
-
-       currentrenderentity = &cl_entities[0].render;
-       softwaretransformidentity();
+       R_DrawBrushModel(ent, true, false);
 }
 
-static void R_SurfMarkLights (void)
+void R_DrawBrushModelNormal (entity_render_t *ent)
 {
-       int                     i;
-       msurface_t      *surf;
-
-       if (r_dynamic.integer)
-               R_MarkLights();
+       c_bmodels++;
+       R_DrawBrushModel(ent, false, true);
+}
 
-       if (!r_vertexsurfaces.integer)
+void R_DrawBrushModelShadowVolumes (entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int visiblevolume)
+{
+       int i, numsurfaces;
+       msurface_t *surf;
+       float projectdistance, f, temp[3], lightradius2;
+       surfmesh_t *mesh;
+       numsurfaces = ent->model->nummodelsurfaces;
+       lightradius2 = lightradius * lightradius;
+       for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < numsurfaces;i++, surf++)
        {
-               for (i = 0;i < currentrenderentity->model->nummodelsurfaces;i++)
+               VectorSubtract(relativelightorigin, surf->poly_center, temp);
+               if (DotProduct(temp, temp) < (surf->poly_radius2 + lightradius2))
                {
-                       surf = currentrenderentity->model->modelsortedsurfaces[i];
-                       if (surf->visframe == r_framecount && surf->lightmaptexture != NULL)
+                       f = PlaneDiff(relativelightorigin, surf->plane);
+                       if (surf->flags & SURF_PLANEBACK)
+                               f = -f;
+                       // draw shadows only for backfaces
+                       if (f < 0)
                        {
-                               if (surf->cached_dlight
-                                || surf->cached_ambient != r_ambient.value
-                                || surf->cached_lightscalebit != lightscalebit)
-                                       R_BuildLightMap(surf, false); // base lighting changed
-                               else if (r_dynamic.integer)
+                               projectdistance = lightradius + f;
+                               if (projectdistance > 0)
                                {
-                                       if  (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0]
-                                        || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
-                                        || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
-                                        || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
-                                               R_BuildLightMap(surf, false); // base lighting changed
-                                       else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
-                                               R_BuildLightMap(surf, true); // only dlights
+                                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+                                       {
+                                               R_Mesh_ResizeCheck(mesh->numverts * 2);
+                                               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+                                               R_Shadow_Volume(mesh->numverts, mesh->numtriangles, mesh->index, mesh->triangleneighbors, relativelightorigin, projectdistance, visiblevolume);
+                                       }
                                }
                        }
                }
        }
 }
 
-void R_MarkWorldLights(void)
+extern cvar_t r_shadows;
+void R_DrawBrushModelFakeShadow (entity_render_t *ent)
 {
-       R_SetupForWorldRendering();
-       R_SurfMarkLights();
-}
+       int i;
+       vec3_t relativelightorigin;
+       rmeshstate_t m;
+       mlight_t *sl;
+       rdlight_t *rd;
 
-/*
-=============
-R_DrawWorld
-=============
-*/
-void R_DrawWorld (void)
-{
-       R_SetupForWorldRendering();
+       if (r_shadows.integer < 2)
+               return;
 
-       if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL)
-               R_SolidWorldNode ();
-       else
-               R_PVSWorldNode ();
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_ONE;
+       m.blendfunc2 = GL_ONE;
+       R_Mesh_State(&m);
+       R_Mesh_Matrix(&ent->matrix);
+       GL_Color(0.0125 * r_colorscale, 0.025 * r_colorscale, 0.1 * r_colorscale, 1);
+       for (i = 0, sl = cl.worldmodel->lights;i < cl.worldmodel->numlights;i++, sl++)
+       {
+               if (d_lightstylevalue[sl->style] > 0
+                && ent->maxs[0] >= sl->origin[0] - sl->cullradius
+                && ent->mins[0] <= sl->origin[0] + sl->cullradius
+                && ent->maxs[1] >= sl->origin[1] - sl->cullradius
+                && ent->mins[1] <= sl->origin[1] + sl->cullradius
+                && ent->maxs[2] >= sl->origin[2] - sl->cullradius
+                && ent->mins[2] <= sl->origin[2] + sl->cullradius)
+               {
+                       Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
+                       R_DrawBrushModelShadowVolumes (ent, relativelightorigin, sl->cullradius, true);
+               }
+       }
+       for (i = 0, rd = r_dlight;i < r_numdlights;i++, rd++)
+       {
+               if (ent->maxs[0] >= rd->origin[0] - rd->cullradius
+                && ent->mins[0] <= rd->origin[0] + rd->cullradius
+                && ent->maxs[1] >= rd->origin[1] - rd->cullradius
+                && ent->mins[1] <= rd->origin[1] + rd->cullradius
+                && ent->maxs[2] >= rd->origin[2] - rd->cullradius
+                && ent->mins[2] <= rd->origin[2] + rd->cullradius)
+               {
+                       Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin);
+                       R_DrawBrushModelShadowVolumes (ent, relativelightorigin, rd->cullradius, true);
+               }
+       }
 }
 
-/*
-=================
-R_DrawBrushModel
-=================
-*/
-void R_DrawBrushModelSky (void)
+static void gl_surf_start(void)
 {
-       R_SetupForBModelRendering();
-
-       R_PrepareSurfaces();
-       R_DrawSurfaces(SHADERSTAGE_SKY);
 }
 
-void R_DrawBrushModelNormal (void)
+static void gl_surf_shutdown(void)
 {
-       c_bmodels++;
-
-       // have to flush queue because of possible lightmap reuse
-       R_Mesh_Render();
+}
 
-       R_SetupForBModelRendering();
+static void gl_surf_newmap(void)
+{
+       // reset pvs visibility variables so it will update on first frame
+       r_pvsframecount = 1;
+       r_pvsviewleaf = NULL;
+       r_pvsviewleafnovis = false;
+}
 
-       R_SurfMarkLights();
+void GL_Surf_Init(void)
+{
+       int i;
+       dlightdivtable[0] = 4194304;
+       for (i = 1;i < 32768;i++)
+               dlightdivtable[i] = 4194304 / (i << 7);
 
-       R_PrepareSurfaces();
+       Cvar_RegisterVariable(&r_ambient);
+       Cvar_RegisterVariable(&r_vertexsurfaces);
+       Cvar_RegisterVariable(&r_dlightmap);
+       Cvar_RegisterVariable(&r_drawportals);
+       Cvar_RegisterVariable(&r_testvis);
+       Cvar_RegisterVariable(&r_floatbuildlightmap);
+       Cvar_RegisterVariable(&r_detailtextures);
+       Cvar_RegisterVariable(&r_surfaceworldnode);
 
-       if (!skyrendermasked)
-               R_DrawSurfaces(SHADERSTAGE_SKY);
-       R_DrawSurfaces(SHADERSTAGE_NORMAL);
+       R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
 }