]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rsurf.c
added firstmodelbrush/nummodelbrushes fields to model struct, and moved brushes from...
[xonotic/darkplaces.git] / gl_rsurf.c
index 976f7e4c702e2da7ed9b24099f2fb6bf67fa9665..02c1ce27956e4886e09706ffffb6aa6e48717987 100644 (file)
@@ -34,32 +34,15 @@ cvar_t r_drawportals = {0, "r_drawportals", "0"};
 cvar_t r_testvis = {0, "r_testvis", "0"};
 cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"};
 cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"};
-cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "1"};
+cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "0"};
 cvar_t r_drawcollisionbrushes_polygonfactor = {0, "r_drawcollisionbrushes_polygonfactor", "-1"};
 cvar_t r_drawcollisionbrushes_polygonoffset = {0, "r_drawcollisionbrushes_polygonoffset", "0"};
+cvar_t r_q3bsp_renderskydepth = {0, "r_q3bsp_renderskydepth", "0"};
 cvar_t gl_lightmaps = {0, "gl_lightmaps", "0"};
 
-/*
-// FIXME: these arrays are huge!
-int r_q1bsp_maxmarkleafs;
-int r_q1bsp_nummarkleafs;
-mleaf_t *r_q1bsp_maxleaflist[65536];
-int r_q1bsp_maxmarksurfaces;
-int r_q1bsp_nummarksurfaces;
-msurface_t *r_q1bsp_maxsurfacelist[65536];
-
-// FIXME: these arrays are huge!
-int r_q3bsp_maxmarkleafs;
-int r_q3bsp_nummarkleafs;
-q3mleaf_t *r_q3bsp_maxleaflist[65536];
-int r_q3bsp_maxmarksurfaces;
-int r_q3bsp_nummarksurfaces;
-q3mface_t *r_q3bsp_maxsurfacelist[65536];
-*/
-
 static int dlightdivtable[32768];
 
-static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
+static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surface)
 {
        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;
@@ -68,17 +51,17 @@ static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 
        lit = false;
 
-       smax = (surf->extents[0] >> 4) + 1;
-       tmax = (surf->extents[1] >> 4) + 1;
+       smax = (surface->extents[0] >> 4) + 1;
+       tmax = (surface->extents[1] >> 4) + 1;
        smax3 = smax * 3;
 
        for (lnum = 0, light = r_dlight;lnum < r_numdlights;lnum++, light++)
        {
-               if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
+               if (!(surface->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
                        continue;                                       // not lit by this light
 
                Matrix4x4_Transform(matrix, light->origin, local);
-               dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
+               dist = DotProduct (local, surface->plane->normal) - surface->plane->dist;
 
                // for comparisons to minimum acceptable light
                // compensate for LIGHTOFFSET
@@ -89,20 +72,20 @@ static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
                if (dist2 >= maxdist)
                        continue;
 
-               if (surf->plane->type < 3)
+               if (surface->plane->type < 3)
                {
                        VectorCopy(local, impact);
-                       impact[surf->plane->type] -= dist;
+                       impact[surface->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;
+                       impact[0] = local[0] - surface->plane->normal[0] * dist;
+                       impact[1] = local[1] - surface->plane->normal[1] * dist;
+                       impact[2] = local[2] - surface->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];
+               impacts = DotProduct (impact, surface->texinfo->vecs[0]) + surface->texinfo->vecs[0][3] - surface->texturemins[0];
+               impactt = DotProduct (impact, surface->texinfo->vecs[1]) + surface->texinfo->vecs[1][3] - surface->texturemins[1];
 
                s = bound(0, impacts, smax * 16) - impacts;
                t = bound(0, impactt, tmax * 16) - impactt;
@@ -154,7 +137,7 @@ static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
        return lit;
 }
 
-static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
+static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surface)
 {
        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;
@@ -162,17 +145,17 @@ static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 
        lit = false;
 
-       smax = (surf->extents[0] >> 4) + 1;
-       tmax = (surf->extents[1] >> 4) + 1;
+       smax = (surface->extents[0] >> 4) + 1;
+       tmax = (surface->extents[1] >> 4) + 1;
        smax3 = smax * 3;
 
        for (lnum = 0, light = r_dlight;lnum < r_numdlights;lnum++, light++)
        {
-               if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
+               if (!(surface->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
                        continue;                                       // not lit by this light
 
                Matrix4x4_Transform(matrix, light->origin, local);
-               dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
+               dist = DotProduct (local, surface->plane->normal) - surface->plane->dist;
 
                // for comparisons to minimum acceptable light
                // compensate for LIGHTOFFSET
@@ -183,20 +166,20 @@ static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
                if (dist2 >= maxdist)
                        continue;
 
-               if (surf->plane->type < 3)
+               if (surface->plane->type < 3)
                {
                        VectorCopy(local, impact);
-                       impact[surf->plane->type] -= dist;
+                       impact[surface->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;
+                       impact[0] = local[0] - surface->plane->normal[0] * dist;
+                       impact[1] = local[1] - surface->plane->normal[1] * dist;
+                       impact[2] = local[2] - surface->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];
+               impacts = DotProduct (impact, surface->texinfo->vecs[0]) + surface->texinfo->vecs[0][3] - surface->texturemins[0];
+               impactt = DotProduct (impact, surface->texinfo->vecs[1]) + surface->texinfo->vecs[1][3] - surface->texturemins[1];
 
                td = bound(0, impacts, smax * 16) - impacts;
                td1 = bound(0, impactt, tmax * 16) - impactt;
@@ -252,7 +235,7 @@ 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)
+static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
 {
        if (!r_floatbuildlightmap.integer)
        {
@@ -261,13 +244,13 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                qbyte *lightmap, *out, *stain;
 
                // update cached lighting info
-               surf->cached_dlight = 0;
+               surface->cached_dlight = 0;
 
-               smax = (surf->extents[0]>>4)+1;
-               tmax = (surf->extents[1]>>4)+1;
+               smax = (surface->extents[0]>>4)+1;
+               tmax = (surface->extents[1]>>4)+1;
                size = smax*tmax;
                size3 = size*3;
-               lightmap = surf->samples;
+               lightmap = surface->samples;
 
        // set to full bright if no light data
                bl = intblocklights;
@@ -279,19 +262,12 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                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));
+                       memset(bl, 0, size*3*sizeof(unsigned int));
 
-                       if (surf->dlightframe == r_framecount)
+                       if (surface->dlightframe == r_framecount)
                        {
-                               surf->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surf);
-                               if (surf->cached_dlight)
+                               surface->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surface);
+                               if (surface->cached_dlight)
                                        c_light_polys++;
                        }
 
@@ -299,13 +275,13 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                        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++)
+                               for (maps = 0;maps < MAXLIGHTMAPS && surface->styles[maps] != 255;maps++, lightmap += size3)
+                                       for (scale = d_lightstylevalue[surface->styles[maps]], i = 0;i < size3;i++)
                                                bl[i] += lightmap[i] * scale;
                        }
                }
 
-               stain = surf->stainsamples;
+               stain = surface->stainsamples;
                bl = intblocklights;
                out = templight;
                // the >> 16 shift adjusts down 8 bits to account for the stainmap
@@ -314,7 +290,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                // (0 = 0.0, 128 = 1.0, 256 = 2.0)
                if (ent->model->brushq1.lightmaprgba)
                {
-                       stride = (surf->lightmaptexturestride - smax) * 4;
+                       stride = (surface->lightmaptexturestride - smax) * 4;
                        for (i = 0;i < tmax;i++, out += stride)
                        {
                                for (j = 0;j < smax;j++)
@@ -328,7 +304,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                }
                else
                {
-                       stride = (surf->lightmaptexturestride - smax) * 3;
+                       stride = (surface->lightmaptexturestride - smax) * 3;
                        for (i = 0;i < tmax;i++, out += stride)
                        {
                                for (j = 0;j < smax;j++)
@@ -340,7 +316,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                        }
                }
 
-               R_UpdateTexture(surf->lightmaptexture, templight);
+               R_UpdateTexture(surface->lightmaptexture, templight);
        }
        else
        {
@@ -349,47 +325,43 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                qbyte *lightmap, *out, *stain;
 
                // update cached lighting info
-               surf->cached_dlight = 0;
+               surface->cached_dlight = 0;
 
-               smax = (surf->extents[0]>>4)+1;
-               tmax = (surf->extents[1]>>4)+1;
+               smax = (surface->extents[0]>>4)+1;
+               tmax = (surface->extents[1]>>4)+1;
                size = smax*tmax;
                size3 = size*3;
-               lightmap = surf->samples;
+               lightmap = surface->samples;
 
        // set to full bright if no light data
                bl = floatblocklights;
                if (!ent->model->brushq1.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;
+                               bl[i] = 255*256;
                }
                else
+               {
                        memset(bl, 0, size*3*sizeof(float));
 
-               if (surf->dlightframe == r_framecount)
-               {
-                       surf->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surf);
-                       if (surf->cached_dlight)
-                               c_light_polys++;
-               }
+                       if (surface->dlightframe == r_framecount)
+                       {
+                               surface->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surface);
+                               if (surface->cached_dlight)
+                                       c_light_polys++;
+                       }
 
-               // 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;
+                       // add all the lightmaps
+                       if (lightmap)
+                       {
+                               bl = floatblocklights;
+                               for (maps = 0;maps < MAXLIGHTMAPS && surface->styles[maps] != 255;maps++, lightmap += size3)
+                                       for (scale = d_lightstylevalue[surface->styles[maps]], i = 0;i < size3;i++)
+                                               bl[i] += lightmap[i] * scale;
+                       }
                }
 
-               stain = surf->stainsamples;
+               stain = surface->stainsamples;
                bl = floatblocklights;
                out = templight;
                // this scaling adjusts down 8 bits to account for the stainmap
@@ -399,7 +371,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                scale = 1.0f / (1 << 16);
                if (ent->model->brushq1.lightmaprgba)
                {
-                       stride = (surf->lightmaptexturestride - smax) * 4;
+                       stride = (surface->lightmaptexturestride - smax) * 4;
                        for (i = 0;i < tmax;i++, out += stride)
                        {
                                for (j = 0;j < smax;j++)
@@ -413,7 +385,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                }
                else
                {
-                       stride = (surf->lightmaptexturestride - smax) * 3;
+                       stride = (surface->lightmaptexturestride - smax) * 3;
                        for (i = 0;i < tmax;i++, out += stride)
                        {
                                for (j = 0;j < smax;j++)
@@ -425,14 +397,14 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                        }
                }
 
-               R_UpdateTexture(surf->lightmaptexture, templight);
+               R_UpdateTexture(surface->lightmaptexture, templight);
        }
 }
 
 void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radius, const float fcolor[8])
 {
        float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2;
-       msurface_t *surf, *endsurf;
+       msurface_t *surface, *endsurface;
        int i, s, t, smax, tmax, smax3, impacts, impactt, stained;
        qbyte *bl;
        vec3_t impact;
@@ -441,7 +413,7 @@ void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radi
        invradius = 1.0f / radius;
 
 loc0:
-       if (node->contents < 0)
+       if (!node->plane)
                return;
        ndist = PlaneDiff(origin, node->plane);
        if (ndist > radius)
@@ -470,15 +442,15 @@ loc0:
                impact[2] = origin[2] - node->plane->normal[2] * ndist;
        }
 
-       for (surf = model->brushq1.surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
+       for (surface = model->brush.data_surfaces + node->firstsurface, endsurface = surface + node->numsurfaces;surface < endsurface;surface++)
        {
-               if (surf->stainsamples)
+               if (surface->stainsamples)
                {
-                       smax = (surf->extents[0] >> 4) + 1;
-                       tmax = (surf->extents[1] >> 4) + 1;
+                       smax = (surface->extents[0] >> 4) + 1;
+                       tmax = (surface->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, surface->texinfo->vecs[0]) + surface->texinfo->vecs[0][3] - surface->texturemins[0];
+                       impactt = DotProduct (impact, surface->texinfo->vecs[1]) + surface->texinfo->vecs[1][3] - surface->texturemins[1];
 
                        s = bound(0, impacts, smax * 16) - impacts;
                        t = bound(0, impactt, tmax * 16) - impactt;
@@ -490,7 +462,7 @@ loc0:
                        for (s = 0, i = impacts; s < smax; s++, i -= 16)
                                sdtable[s] = i * i + dist2;
 
-                       bl = surf->stainsamples;
+                       bl = surface->stainsamples;
                        smax3 = smax * 3;
                        stained = false;
 
@@ -526,13 +498,13 @@ loc0:
                        }
                        // force lightmap upload
                        if (stained)
-                               surf->cached_dlight = true;
+                               surface->cached_dlight = true;
                }
        }
 
-       if (node->children[0]->contents >= 0)
+       if (node->children[0]->plane)
        {
-               if (node->children[1]->contents >= 0)
+               if (node->children[1]->plane)
                {
                        R_StainNode(node->children[0], model, origin, radius, fcolor);
                        node = node->children[1];
@@ -544,7 +516,7 @@ loc0:
                        goto loc0;
                }
        }
-       else if (node->children[1]->contents >= 0)
+       else if (node->children[1]->plane)
        {
                node = node->children[1];
                goto loc0;
@@ -558,7 +530,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
        entity_render_t *ent;
        model_t *model;
        vec3_t org;
-       if (cl.worldmodel == NULL || !cl.worldmodel->brushq1.nodes)
+       if (r_refdef.worldmodel == NULL || !r_refdef.worldmodel->brush.data_nodes)
                return;
        fcolor[0] = cr1;
        fcolor[1] = cg1;
@@ -569,7 +541,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
        fcolor[6] = cb2 - cb1;
        fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f);
 
-       R_StainNode(cl.worldmodel->brushq1.nodes + cl.worldmodel->brushq1.hulls[0].firstclipnode, cl.worldmodel, origin, radius, fcolor);
+       R_StainNode(r_refdef.worldmodel->brush.data_nodes + r_refdef.worldmodel->brushq1.hulls[0].firstclipnode, r_refdef.worldmodel, origin, radius, fcolor);
 
        // look for embedded bmodels
        for (n = 0;n < cl_num_brushmodel_entities;n++)
@@ -579,10 +551,10 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
                if (model && model->name[0] == '*')
                {
                        Mod_CheckLoaded(model);
-                       if (model->brushq1.nodes)
+                       if (model->brush.data_nodes)
                        {
                                Matrix4x4_Transform(&ent->inversematrix, origin, org);
-                               R_StainNode(model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode, model, org, radius, fcolor);
+                               R_StainNode(model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, model, org, radius, fcolor);
                        }
                }
        }
@@ -727,805 +699,587 @@ static int RSurf_LightSeparate_Vertex3f_Color4f(const matrix4x4_t *matrix, const
        return lit;
 }
 
-static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-
-       // LordHavoc: HalfLife maps have freaky skypolys...
-       if (ent->model->brush.ishlbsp)
-               return;
-
-       if (skyrendernow)
-       {
-               skyrendernow = false;
-               if (skyrendermasked)
-                       R_Sky();
-       }
-
-       R_Mesh_Matrix(&ent->matrix);
-
-       GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1);
-       if (skyrendermasked)
-       {
-               // depth-only (masking)
-               GL_ColorMask(0,0,0,0);
-               // just to make sure that braindead drivers don't draw anything
-               // despite that colormask...
-               GL_BlendFunc(GL_ZERO, GL_ONE);
-       }
-       else
-       {
-               // fog sky
-               GL_BlendFunc(GL_ONE, GL_ZERO);
-       }
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-
-       memset(&m, 0, sizeof(m));
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-       GL_ColorMask(1,1,1,1);
-}
-
-static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
+static void RSurfShader_Transparent_Callback(const void *calldata1, int calldata2)
 {
        const entity_render_t *ent = calldata1;
-       const msurface_t *surf = ent->model->brushq1.surfaces + calldata2;
+       const msurface_t *surface = ent->model->brush.data_surfaces + calldata2;
        rmeshstate_t m;
-       float alpha;
-       float modelorg[3];
+       float currentalpha;
+       float base, colorscale;
+       vec3_t modelorg;
        texture_t *texture;
-       matrix4x4_t tempmatrix;
-       float   args[4] = {0.05f,0,0,0.04f};
-
-       if (gl_textureshader && r_watershader.value && !fogenabled)
-       {
-               Matrix4x4_CreateTranslate(&tempmatrix, sin(cl.time) * 0.025 * r_waterscroll.value, sin(cl.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
-               R_Mesh_TextureMatrix(1, &tempmatrix);
-               Matrix4x4_CreateFromQuakeEntity(&tempmatrix, 0, 0, 0, 0, 0, 0, r_watershader.value);
-               R_Mesh_TextureMatrix(0, &tempmatrix);
-       }
-       else if (r_waterscroll.value)
-       {
-               // scrolling in texture matrix
-               Matrix4x4_CreateTranslate(&tempmatrix, sin(cl.time) * 0.025 * r_waterscroll.value, sin(cl.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
-               R_Mesh_TextureMatrix(0, &tempmatrix);
-       }
+       float args[4] = {0.05f,0,0,0.04f};
+       int rendertype, turb, fullbright;
 
        R_Mesh_Matrix(&ent->matrix);
        Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
 
-       memset(&m, 0, sizeof(m));
-       texture = surf->texinfo->texture->currentframe;
-       alpha = texture->currentalpha;
-       if (texture->rendertype == SURFRENDER_ADD)
+       texture = surface->texture;
+       if (texture->animated)
+               texture = texture->anim_frames[ent->frame != 0][(texture->anim_total[ent->frame != 0] >= 2) ? ((int) (r_refdef.time * 5.0f) % texture->anim_total[ent->frame != 0]) : 0];
+       currentalpha = ent->alpha;
+       if (texture->flags & SURF_WATERALPHA)
+               currentalpha *= r_wateralpha.value;
+
+       GL_DepthTest(!(ent->effects & EF_NODEPTHTEST));
+       if (ent->effects & EF_ADDITIVE)
        {
+               rendertype = SURFRENDER_ADD;
                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
                GL_DepthMask(false);
        }
-       else if (texture->rendertype == SURFRENDER_ALPHA)
+       else if (currentalpha < 1 || texture->skin.fog != NULL)
        {
+               rendertype = SURFRENDER_ALPHA;
                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                GL_DepthMask(false);
        }
        else
        {
+               rendertype = SURFRENDER_OPAQUE;
                GL_BlendFunc(GL_ONE, GL_ZERO);
-               GL_DepthMask(true);
+               GL_DepthMask(!(ent->effects & EF_NODEPTHTEST));
        }
-       if (gl_textureshader && r_watershader.value && !fogenabled)
+
+       turb = (texture->flags & SURF_DRAWTURB) && r_waterscroll.value;
+       fullbright = !(ent->flags & RENDER_LIGHT) || (texture->flags & SURF_DRAWFULLBRIGHT) || !surface->samples;
+       base = fullbright ? 2.0f : r_ambient.value * (1.0f / 64.0f);
+       if (texture->flags & SURF_DRAWTURB)
+               base *= 0.5f;
+       if ((texture->flags & SURF_DRAWTURB) && gl_textureshader && r_watershader.value && !fogenabled && fullbright && ent->colormod[0] == 1 && ent->colormod[1] == 1 && ent->colormod[2] == 1)
        {
-               m.tex[0] = R_GetTexture(mod_shared_distorttexture[(int)(cl.time * 16)&63]);
+               // NVIDIA Geforce3 distortion texture shader on water
+               GL_Color(1, 1, 1, currentalpha);
+               memset(&m, 0, sizeof(m));
+               m.pointer_vertex = surface->mesh.data_vertex3f;
+               m.tex[0] = R_GetTexture(mod_shared_distorttexture[(int)(r_refdef.time * 16)&63]);
                m.tex[1] = R_GetTexture(texture->skin.base);
+               m.texcombinergb[0] = GL_REPLACE;
+               m.texcombinergb[1] = GL_REPLACE;
+               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+               m.pointer_texcoord[1] = surface->mesh.data_texcoordtexture2f;
+               Matrix4x4_CreateFromQuakeEntity(&m.texmatrix[0], 0, 0, 0, 0, 0, 0, r_watershader.value);
+               Matrix4x4_CreateTranslate(&m.texmatrix[1], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
+               R_Mesh_State(&m);
+
+               GL_ActiveTexture(0);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
+               GL_ActiveTexture(1);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_OFFSET_TEXTURE_2D_NV);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB);
+               qglTexEnvfv(GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, &args[0]);
+               qglEnable(GL_TEXTURE_SHADER_NV);
+
+               GL_LockArrays(0, surface->mesh.num_vertices);
+               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+               GL_LockArrays(0, 0);
+
+               qglDisable(GL_TEXTURE_SHADER_NV);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
+               GL_ActiveTexture(0);
        }
        else
-               m.tex[0] = R_GetTexture(texture->skin.base);
-       GL_DepthTest(true);
-       if (fogenabled)
-               m.pointer_color = varray_color4f;
-       else
-               GL_Color(1, 1, 1, alpha);
-       if (gl_textureshader && r_watershader.value && !fogenabled)
        {
-               GL_ActiveTexture (0);
-               qglTexEnvi (GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
-               GL_ActiveTexture (1);
-               qglTexEnvi (GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
-               qglTexEnvi (GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_OFFSET_TEXTURE_2D_NV);
-               qglTexEnvi (GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB);
-               qglTexEnvfv (GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, &args[0]);
-               qglEnable (GL_TEXTURE_SHADER_NV);
+               memset(&m, 0, sizeof(m));
+               m.pointer_vertex = surface->mesh.data_vertex3f;
+               m.pointer_color = varray_color4f;
+               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+               m.tex[0] = R_GetTexture(texture->skin.base);
+               if (turb)
+               {
+                       // scrolling in texture matrix
+                       Matrix4x4_CreateTranslate(&m.texmatrix[0], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
+               }
+               colorscale = 1;
+               if (gl_combine.integer)
+               {
+                       m.texrgbscale[0] = 4;
+                       colorscale *= 0.25f;
+               }
+               R_FillColors(varray_color4f, surface->mesh.num_vertices, base * ent->colormod[0], base * ent->colormod[1], base * ent->colormod[2], currentalpha);
+               if (!fullbright)
+               {
+                       if (surface->dlightframe == r_framecount)
+                               RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surface->dlightbits, surface->mesh.num_vertices, surface->mesh.data_vertex3f, varray_color4f, 1);
+                       if (surface->samples)
+                               RSurf_AddLightmapToVertexColors_Color4f(surface->mesh.data_lightmapoffsets, varray_color4f,surface->mesh.num_vertices, surface->samples, ((surface->extents[0]>>4)+1)*((surface->extents[1]>>4)+1)*3, surface->styles);
+               }
+               RSurf_FogColors_Vertex3f_Color4f(surface->mesh.data_vertex3f, varray_color4f, colorscale, surface->mesh.num_vertices, modelorg);
+               R_Mesh_State(&m);
+               GL_LockArrays(0, surface->mesh.num_vertices);
+               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+               GL_LockArrays(0, 0);
+               if (texture->skin.glow)
+               {
+                       memset(&m, 0, sizeof(m));
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+                       GL_DepthMask(false);
+                       m.pointer_color = varray_color4f;
+                       m.tex[0] = R_GetTexture(texture->skin.glow);
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       if (m.tex[0])
+                       {
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               if (turb)
+                               {
+                                       // scrolling in texture matrix
+                                       Matrix4x4_CreateTranslate(&m.texmatrix[0], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
+                               }
+                       }
+                       R_Mesh_State(&m);
+                       RSurf_FoggedColors_Vertex3f_Color4f(surface->mesh.data_vertex3f, varray_color4f, 1, 1, 1, currentalpha, 1, surface->mesh.num_vertices, modelorg);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
+               if (fogenabled && rendertype != SURFRENDER_ADD)
+               {
+                       memset(&m, 0, sizeof(m));
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+                       GL_DepthMask(false);
+                       m.pointer_color = varray_color4f;
+                       m.tex[0] = R_GetTexture(texture->skin.fog);
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       if (m.tex[0])
+                       {
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               if (turb)
+                               {
+                                       // scrolling in texture matrix
+                                       Matrix4x4_CreateTranslate(&m.texmatrix[0], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
+                               }
+                       }
+                       R_Mesh_State(&m);
+                       RSurf_FogPassColors_Vertex3f_Color4f(surface->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, 1, surface->mesh.num_vertices, modelorg);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
        }
+}
 
-       if (fogenabled)
-       {
-               R_FillColors(varray_color4f, surf->mesh.num_vertices, 1, 1, 1, alpha);
-               RSurf_FogColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, 1, surf->mesh.num_vertices, modelorg);
-       }
-       m.pointer_vertex = surf->mesh.data_vertex3f;
-       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-       m.pointer_texcoord[1] = surf->mesh.data_texcoordtexture2f;
-       m.texcombinergb[1] = GL_REPLACE;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+void R_UpdateTextureInfo(entity_render_t *ent)
+{
+       int i, texframe, alttextures;
+       texture_t *t;
+
+       if (!ent->model)
+               return;
 
-       if (gl_textureshader && r_watershader.value && !fogenabled)
+       alttextures = ent->frame != 0;
+       texframe = (int)(r_refdef.time * 5.0f);
+       for (i = 0;i < ent->model->brush.num_textures;i++)
        {
-               qglDisable (GL_TEXTURE_SHADER_NV);
-               GL_ActiveTexture (0);
+               t = ent->model->brush.data_textures + i;
+               t->currentalpha = ent->alpha;
+               if (t->flags & SURF_WATERALPHA)
+                       t->currentalpha *= r_wateralpha.value;
+               if (ent->effects & EF_ADDITIVE)
+                       t->rendertype = SURFRENDER_ADD;
+               else if (t->currentalpha < 1 || t->skin.fog != NULL)
+                       t->rendertype = SURFRENDER_ALPHA;
+               else
+                       t->rendertype = SURFRENDER_OPAQUE;
+               // we don't need to set currentframe if t->animated is false because
+               // it was already set up by the texture loader for non-animating
+               if (t->animated)
+                       t->currentframe = t->anim_frames[alttextures][(t->anim_total[alttextures] >= 2) ? (texframe % t->anim_total[alttextures]) : 0];
        }
+}
 
-       if (fogenabled)
+void R_DrawSurfaceList(entity_render_t *ent, texture_t *texture, int texturenumsurfaces, msurface_t **texturesurfacelist)
+{
+       int texturesurfaceindex;
+       vec3_t tempcenter, center, modelorg;
+       msurface_t *surface;
+       rmeshstate_t m;
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+       if (gl_lightmaps.integer)
        {
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               GL_DepthMask(true);
+               GL_DepthTest(true);
+               GL_Color(1, 1, 1, 1);
                memset(&m, 0, sizeof(m));
-               m.pointer_vertex = surf->mesh.data_vertex3f;
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.tex[0] = R_GetTexture(surface->lightmaptexture);
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordlightmap2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
+       }
+       else if (texture->rendertype != SURFRENDER_OPAQUE)
+       {
+               // transparent vertex shaded from lightmap
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       tempcenter[0] = (surface->mins[0] + surface->maxs[0]) * 0.5f;
+                       tempcenter[1] = (surface->mins[1] + surface->maxs[1]) * 0.5f;
+                       tempcenter[2] = (surface->mins[2] + surface->maxs[2]) * 0.5f;
+                       Matrix4x4_Transform(&ent->matrix, tempcenter, center);
+                       R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_vieworigin : center, RSurfShader_Transparent_Callback, ent, surface - ent->model->brush.data_surfaces);
+               }
+       }
+       else if (texture->flags & SURF_LIGHTMAP)
+       {
+               qboolean dolightmap = (ent->flags & RENDER_LIGHT);
+               qboolean dobase = true;
+               qboolean doambient = r_ambient.value > 0;
+               qboolean dodetail = r_detailtextures.integer != 0;
+               qboolean doglow = texture->skin.glow != NULL;
+               qboolean dofog = fogenabled;
+               // multitexture cases
+               if (r_textureunits.integer >= 2 && gl_combine.integer && dobase && dolightmap)
+               {
+                       dobase = false;
+                       dolightmap = false;
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+                       GL_DepthMask(true);
+                       GL_DepthTest(true);
+                       GL_Color(1, 1, 1, 1);
+                       GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1);
+                       memset(&m, 0, sizeof(m));
+                       m.tex[0] = R_GetTexture(texture->skin.base);
+                       m.texrgbscale[1] = 2;
+                       if (r_textureunits.integer >= 3 && !doambient && dodetail)
+                       {
+                               m.tex[2] = R_GetTexture(texture->skin.detail);
+                               m.texrgbscale[2] = 2;
+                               dodetail = false;
+                               if (r_textureunits.integer >= 3 && texture->skin.glow)
+                               {
+                                       m.tex[3] = R_GetTexture(texture->skin.glow);
+                                       m.texcombinergb[3] = GL_ADD;
+                                       doglow = false;
+                                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                                       {
+                                               surface = texturesurfacelist[texturesurfaceindex];
+                                               m.tex[1] = R_GetTexture(surface->lightmaptexture);
+                                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                                               m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f;
+                                               m.pointer_texcoord[2] = surface->mesh.data_texcoorddetail2f;
+                                               m.pointer_texcoord[3] = surface->mesh.data_texcoordtexture2f;
+                                               R_Mesh_State(&m);
+                                               GL_LockArrays(0, surface->mesh.num_vertices);
+                                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                                               GL_LockArrays(0, 0);
+                                       }
+                               }
+                               else
+                               {
+                                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                                       {
+                                               surface = texturesurfacelist[texturesurfaceindex];
+                                               m.tex[1] = R_GetTexture(surface->lightmaptexture);
+                                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                                               m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f;
+                                               m.pointer_texcoord[2] = surface->mesh.data_texcoorddetail2f;
+                                               R_Mesh_State(&m);
+                                               GL_LockArrays(0, surface->mesh.num_vertices);
+                                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                                               GL_LockArrays(0, 0);
+                                       }
+                               }
+                       }
+                       else if (r_textureunits.integer >= 3 && !doambient && !dodetail && doglow)
+                       {
+                               m.tex[2] = R_GetTexture(texture->skin.glow);
+                               m.texcombinergb[2] = GL_ADD;
+                               doglow = false;
+                               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                               {
+                                       surface = texturesurfacelist[texturesurfaceindex];
+                                       m.tex[1] = R_GetTexture(surface->lightmaptexture);
+                                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                                       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                                       m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f;
+                                       m.pointer_texcoord[2] = surface->mesh.data_texcoordtexture2f;
+                                       R_Mesh_State(&m);
+                                       GL_LockArrays(0, surface->mesh.num_vertices);
+                                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                                       GL_LockArrays(0, 0);
+                               }
+                       }
+               }
+               // anything not handled above
+               if (dobase)
+               {
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+                       GL_DepthMask(true);
+                       GL_DepthTest(true);
+                       GL_Color(1, 1, 1, 1);
+                       if (ent->flags & RENDER_LIGHT)
+                               GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1);
+                       else
+                               GL_Color(ent->colormod[0], ent->colormod[1], ent->colormod[2], 1);
+                       memset(&m, 0, sizeof(m));
+                       m.tex[0] = R_GetTexture(texture->skin.base);
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+               }
                GL_DepthMask(false);
-               GL_DepthTest(true);
-               m.tex[0] = R_GetTexture(texture->skin.fog);
-               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-               m.pointer_color = varray_color4f;
-               R_Mesh_State(&m);
-               RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], alpha, 1, surf->mesh.num_vertices, modelorg);
-               R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+               if (dolightmap)
+               {
+                       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+                       GL_DepthMask(false);
+                       GL_DepthTest(true);
+                       GL_Color(1, 1, 1, 1);
+                       memset(&m, 0, sizeof(m));
+                       m.tex[0] = R_GetTexture(texture->skin.base);
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               m.tex[0] = R_GetTexture(surface->lightmaptexture);
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordlightmap2f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+               }
+               if (doambient)
+               {
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+                       GL_DepthMask(false);
+                       GL_DepthTest(true);
+                       memset(&m, 0, sizeof(m));
+                       GL_Color(r_ambient.value * (1.0f / 128.0f) * ent->colormod[0], r_ambient.value * (1.0f / 128.0f) * ent->colormod[1], r_ambient.value * (1.0f / 128.0f) * ent->colormod[2], 1);
+                       m.tex[0] = R_GetTexture(texture->skin.base);
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+               }
+               if (dodetail)
+               {
+                       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+                       GL_DepthMask(false);
+                       GL_DepthTest(true);
+                       GL_Color(1, 1, 1, 1);
+                       memset(&m, 0, sizeof(m));
+                       m.tex[0] = R_GetTexture(texture->skin.detail);
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+               }
+               if (doglow)
+               {
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+                       GL_DepthMask(false);
+                       GL_DepthTest(true);
+                       GL_Color(1, 1, 1, 1);
+                       memset(&m, 0, sizeof(m));
+                       m.tex[0] = R_GetTexture(texture->skin.glow);
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+               }
+               if (dofog)
+               {
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                       GL_DepthMask(false);
+                       GL_DepthTest(true);
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_color = varray_color4f;
+                       m.tex[0] = R_GetTexture(texture->skin.glow);
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               if (m.tex[0])
+                                       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               R_Mesh_State(&m);
+                               RSurf_FogPassColors_Vertex3f_Color4f(surface->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, 1, surface->mesh.num_vertices, modelorg);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+               }
        }
-
-       if ((gl_textureshader && r_watershader.value && !fogenabled) || r_waterscroll.value)
+       else if (texture->flags & SURF_DRAWTURB)
        {
-               Matrix4x4_CreateIdentity(&tempmatrix);
-               R_Mesh_TextureMatrix(0, &tempmatrix);
-               R_Mesh_TextureMatrix(1, &tempmatrix);
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       RSurfShader_Transparent_Callback(ent, surface - ent->model->brush.data_surfaces);
+               }
        }
-}
-
-static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       msurface_t **chain;
-       vec3_t center;
-       if (texture->rendertype != SURFRENDER_OPAQUE)
+       else if (texture->flags & SURF_DRAWSKY)
        {
-               for (chain = surfchain;(surf = *chain) != NULL;chain++)
+               if (skyrendernow)
+               {
+                       skyrendernow = false;
+                       if (skyrendermasked)
+                               R_Sky();
+               }
+               // LordHavoc: HalfLife maps have freaky skypolys...
+               if (!ent->model->brush.ishlbsp)
                {
-                       if (surf->visframe == r_framecount)
+                       R_Mesh_Matrix(&ent->matrix);
+                       GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1);
+                       if (skyrendermasked)
+                       {
+                               // depth-only (masking)
+                               GL_ColorMask(0,0,0,0);
+                               // just to make sure that braindead drivers don't draw anything
+                               // despite that colormask...
+                               GL_BlendFunc(GL_ZERO, GL_ONE);
+                       }
+                       else
                        {
-                               Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
-                               R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->brushq1.surfaces);
+                               // fog sky
+                               GL_BlendFunc(GL_ONE, GL_ZERO);
                        }
+                       GL_DepthMask(true);
+                       GL_DepthTest(true);
+                       memset(&m, 0, sizeof(m));
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+                       GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
                }
        }
-       else
-               for (chain = surfchain;(surf = *chain) != NULL;chain++)
-                       if (surf->visframe == r_framecount)
-                               RSurfShader_Water_Callback(ent, surf - ent->model->brushq1.surfaces);
 }
 
-static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha)
+void R_DrawSurfaces(entity_render_t *ent, qboolean skysurfaces)
 {
-       float base, colorscale;
-       rmeshstate_t m;
-       float modelorg[3];
+       int i, j, f, flagsmask;
+       msurface_t *surface, **surfacechain;
+       texture_t *t, *texture;
+       model_t *model = ent->model;
+       vec3_t modelorg;
+       const int maxsurfacelist = 1024;
+       int numsurfacelist = 0;
+       msurface_t *surfacelist[1024];
+       if (model == NULL)
+               return;
+       R_Mesh_Matrix(&ent->matrix);
        Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-       memset(&m, 0, sizeof(m));
-       if (rendertype == SURFRENDER_ADD)
-       {
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-               GL_DepthMask(false);
-       }
-       else if (rendertype == SURFRENDER_ALPHA)
-       {
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-               GL_DepthMask(false);
-       }
-       else
+
+       if (ent != r_refdef.worldentity)
        {
-               GL_BlendFunc(GL_ONE, GL_ZERO);
-               GL_DepthMask(true);
+               // because bmodels can be reused, we have to clear dlightframe every time
+               surface = model->brush.data_surfaces + model->firstmodelsurface;
+               for (i = 0;i < model->nummodelsurfaces;i++, surface++)
+                       surface->dlightframe = -1;
        }
-       m.tex[0] = R_GetTexture(texture->skin.base);
-       colorscale = 1;
-       if (gl_combine.integer)
+
+       // update light styles
+       if (!skysurfaces)
        {
-               m.texrgbscale[0] = 4;
-               colorscale *= 0.25f;
+               if (r_dynamic.integer && !r_rtdlight)
+                       R_MarkLights(ent);
+               for (i = 0;i < model->brushq1.light_styles;i++)
+               {
+                       if (model->brushq1.light_stylevalue[i] != d_lightstylevalue[model->brushq1.light_style[i]])
+                       {
+                               model->brushq1.light_stylevalue[i] = d_lightstylevalue[model->brushq1.light_style[i]];
+                               if ((surfacechain = model->brushq1.light_styleupdatechains[i]))
+                                       for (;(surface = *surfacechain);surfacechain++)
+                                               surface->cached_dlight = true;
+                       }
+               }
        }
-       base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f);
-       GL_DepthTest(true);
 
-       m.pointer_color = varray_color4f;
-       m.pointer_vertex = surf->mesh.data_vertex3f;
-       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-       R_Mesh_State(&m);
-       R_FillColors(varray_color4f, surf->mesh.num_vertices, base, base, base, currentalpha);
-       if (!(ent->effects & EF_FULLBRIGHT))
+       R_UpdateTextureInfo(ent);
+       flagsmask = skysurfaces ? SURF_DRAWSKY : (SURF_DRAWTURB | SURF_LIGHTMAP);
+       f = 0;
+       t = NULL;
+       numsurfacelist = 0;
+       for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
        {
-               if (surf->dlightframe == r_framecount)
-                       RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, surf->mesh.num_vertices, surf->mesh.data_vertex3f, varray_color4f, 1);
-               if (surf->flags & SURF_LIGHTMAP)
-                       RSurf_AddLightmapToVertexColors_Color4f(surf->mesh.data_lightmapoffsets, varray_color4f,surf->mesh.num_vertices, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
+               if (ent != r_refdef.worldentity || r_worldsurfacevisible[j])
+               {
+                       surface = model->brush.data_surfaces + j;
+                       if (t != surface->texture)
+                       {
+                               if (numsurfacelist)
+                               {
+                                       R_DrawSurfaceList(ent, texture, numsurfacelist, surfacelist);
+                                       numsurfacelist = 0;
+                               }
+                               t = surface->texture;
+                               f = t->flags & flagsmask;
+                               texture = t->currentframe;
+                       }
+                       if (f)
+                       {
+                               // add face to draw list and update lightmap if necessary
+                               c_faces++;
+                               if (surface->cached_dlight && surface->lightmaptexture != NULL)
+                                       R_BuildLightMap(ent, surface);
+                               surfacelist[numsurfacelist++] = surface;
+                               if (numsurfacelist >= maxsurfacelist)
+                               {
+                                       R_DrawSurfaceList(ent, texture, numsurfacelist, surfacelist);
+                                       numsurfacelist = 0;
+                               }
+                       }
+               }
        }
-       RSurf_FogColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, colorscale, surf->mesh.num_vertices, modelorg);
-       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+       if (numsurfacelist)
+               R_DrawSurfaceList(ent, texture, numsurfacelist, surfacelist);
 }
 
-static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha)
+static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
 {
+       int i;
+       float *v;
        rmeshstate_t m;
-       float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       const mportal_t *portal = calldata1;
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        GL_DepthMask(false);
        GL_DepthTest(true);
-       m.pointer_color = varray_color4f;
-       m.tex[0] = R_GetTexture(texture->skin.glow);
+       R_Mesh_Matrix(&r_identitymatrix);
 
-       m.pointer_vertex = surf->mesh.data_vertex3f;
-       if (m.tex[0])
-               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = varray_vertex3f;
        R_Mesh_State(&m);
-       RSurf_FoggedColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, 1, 1, 1, currentalpha, 1, surf->mesh.num_vertices, modelorg);
-       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-}
 
-static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha)
-{
-       rmeshstate_t m;
-       float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       m.pointer_color = varray_color4f;
-       m.tex[0] = R_GetTexture(texture->skin.fog);
-
-       m.pointer_vertex = surf->mesh.data_vertex3f;
-       if (m.tex[0])
-               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-       R_Mesh_State(&m);
-       RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, 1, surf->mesh.num_vertices, modelorg);
-       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-}
-
-static void RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetailGlow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       int lightmaptexturenum;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(texture->skin.base);
-       m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
-       m.texrgbscale[1] = 2;
-       m.tex[2] = R_GetTexture(texture->skin.detail);
-       m.texrgbscale[2] = 2;
-       if (texture->skin.glow)
-       {
-               m.tex[3] = R_GetTexture(texture->skin.glow);
-               m.texcombinergb[3] = GL_ADD;
-       }
-       if (r_shadow_realtime_world.integer)
-               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
-       else
-               GL_Color(1, 1, 1, 1);
-
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-                       m.tex[1] = lightmaptexturenum;
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-                       m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f;
-                       m.pointer_texcoord[2] = surf->mesh.data_texcoorddetail2f;
-                       m.pointer_texcoord[3] = surf->mesh.data_texcoordtexture2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetail(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       int lightmaptexturenum;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(texture->skin.base);
-       m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
-       m.texrgbscale[1] = 2;
-       m.tex[2] = R_GetTexture(texture->skin.detail);
-       m.texrgbscale[2] = 2;
-       if (r_shadow_realtime_world.integer)
-               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
-       else
-               GL_Color(1, 1, 1, 1);
-
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-                       m.tex[1] = lightmaptexturenum;
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-                       m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f;
-                       m.pointer_texcoord[2] = surf->mesh.data_texcoorddetail2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       int lightmaptexturenum;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(texture->skin.base);
-       m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
-       m.texrgbscale[1] = 2;
-       if (r_shadow_realtime_world.integer)
-               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
-       else
-               GL_Color(1, 1, 1, 1);
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-                       m.tex[1] = lightmaptexturenum;
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-                       m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       m.tex[0] = R_GetTexture(texture->skin.base);
-       if (r_shadow_realtime_world.integer)
-               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
-       else
-               GL_Color(1, 1, 1, 1);
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       int lightmaptexturenum;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture((**surfchain).lightmaptexture);
-       GL_Color(1, 1, 1, 1);
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-                       m.tex[0] = lightmaptexturenum;
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordlightmap2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       m.pointer_color = varray_color4f;
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       if (m.tex[0])
-                               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-                       R_Mesh_State(&m);
-                       RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, 1, surf->mesh.num_vertices, modelorg);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(texture->skin.detail);
-       GL_Color(1, 1, 1, 1);
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoorddetail2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(texture->skin.glow);
-       GL_Color(1, 1, 1, 1);
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-/*
-static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
-       GL_DepthMask(true);
-       m.tex[0] = R_GetTexture(texture->skin.glow);
-       if (m.tex[0])
-               GL_Color(1, 1, 1, 1);
-       else
-               GL_Color(0, 0, 0, 1);
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-*/
-
-static void RSurfShader_OpaqueWall_Pass_BaseLightmapOnly(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       rmeshstate_t m;
-       int lightmaptexturenum;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture((**surfchain).lightmaptexture);
-       if (r_shadow_realtime_world.integer)
-               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
-       else
-               GL_Color(1, 1, 1, 1);
-       while((surf = *surfchain++) != NULL)
-       {
-               if (surf->visframe == r_framecount)
-               {
-                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-                       m.tex[0] = lightmaptexturenum;
-                       m.pointer_vertex = surf->mesh.data_vertex3f;
-                       m.pointer_texcoord[0] = surf->mesh.data_texcoordlightmap2f;
-                       R_Mesh_State(&m);
-                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
-               }
-       }
-}
-
-static void RSurfShader_Wall_Vertex_Callback(const void *calldata1, int calldata2)
-{
-       const entity_render_t *ent = calldata1;
-       const msurface_t *surf = ent->model->brushq1.surfaces + calldata2;
-       int rendertype;
-       float currentalpha;
-       texture_t *texture;
-       R_Mesh_Matrix(&ent->matrix);
-
-       texture = surf->texinfo->texture;
-       if (texture->animated)
-               texture = texture->anim_frames[ent->frame != 0][(texture->anim_total[ent->frame != 0] >= 2) ? ((int) (cl.time * 5.0f) % texture->anim_total[ent->frame != 0]) : 0];
-
-       currentalpha = ent->alpha;
-       if (ent->effects & EF_ADDITIVE)
-               rendertype = SURFRENDER_ADD;
-       else if (currentalpha < 1 || texture->skin.fog != NULL)
-               rendertype = SURFRENDER_ALPHA;
-       else
-               rendertype = SURFRENDER_OPAQUE;
-
-       RSurfShader_Wall_Pass_BaseVertex(ent, surf, texture, rendertype, currentalpha);
-       if (texture->skin.glow)
-               RSurfShader_Wall_Pass_Glow(ent, surf, texture, rendertype, currentalpha);
-       if (fogenabled)
-               RSurfShader_Wall_Pass_Fog(ent, surf, texture, rendertype, currentalpha);
-}
-
-static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
-{
-       const msurface_t *surf;
-       msurface_t **chain;
-       vec3_t center;
-       if (texture->rendertype != SURFRENDER_OPAQUE)
-       {
-               // transparent vertex shaded from lightmap
-               for (chain = surfchain;(surf = *chain) != NULL;chain++)
-               {
-                       if (surf->visframe == r_framecount)
-                       {
-                               Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
-                               R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->brushq1.surfaces);
-                       }
-               }
-       }
-       else if (ent->effects & EF_FULLBRIGHT)
-       {
-               RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain);
-               if (r_detailtextures.integer)
-                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
-               if (texture->skin.glow)
-                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
-               if (fogenabled)
-                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
-       }
-       /*
-       // opaque base lighting
-       else if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0)
-       {
-               if (r_ambient.value > 0)
-               {
-               }
-               else
-                       RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, surfchain);
-               if (fogenabled)
-                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
-       }
-       */
-       // opaque lightmapped
-       else if (r_textureunits.integer >= 4 && gl_combine.integer && r_detailtextures.integer && !gl_lightmaps.integer)
-       {
-               RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetailGlow(ent, texture, surfchain);
-               if (fogenabled)
-                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
-       }
-       else if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer && !gl_lightmaps.integer)
-       {
-               RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetail(ent, texture, surfchain);
-               if (texture->skin.glow)
-                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
-               if (fogenabled)
-                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
-       }
-       else if (r_textureunits.integer >= 2 && gl_combine.integer && !gl_lightmaps.integer)
-       {
-               RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmap(ent, texture, surfchain);
-               if (r_detailtextures.integer)
-                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
-               if (texture->skin.glow)
-                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
-               if (fogenabled)
-                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
-       }
-       else if (!gl_lightmaps.integer)
-       {
-               RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain);
-               RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, surfchain);
-               if (r_detailtextures.integer)
-                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
-               if (texture->skin.glow)
-                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
-               if (fogenabled)
-                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
-       }
-       else
-       {
-               RSurfShader_OpaqueWall_Pass_BaseLightmapOnly(ent, texture, surfchain);
-               if (fogenabled)
-                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
-       }
-}
-
-Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, SHADERFLAGS_NEEDLIGHTMAP};
-Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, 0};
-Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, 0};
-
-int Cshader_count = 3;
-Cshader_t *Cshaders[3] =
-{
-       &Cshader_wall_lightmap,
-       &Cshader_water,
-       &Cshader_sky
-};
-
-void R_UpdateTextureInfo(entity_render_t *ent)
-{
-       int i, texframe, alttextures;
-       texture_t *t;
-
-       if (!ent->model)
-               return;
-
-       alttextures = ent->frame != 0;
-       texframe = (int)(cl.time * 5.0f);
-       for (i = 0;i < ent->model->brushq1.numtextures;i++)
-       {
-               t = ent->model->brushq1.textures + i;
-               t->currentalpha = ent->alpha;
-               if (t->flags & SURF_WATERALPHA)
-                       t->currentalpha *= r_wateralpha.value;
-               if (ent->effects & EF_ADDITIVE)
-                       t->rendertype = SURFRENDER_ADD;
-               else if (t->currentalpha < 1 || t->skin.fog != NULL)
-                       t->rendertype = SURFRENDER_ALPHA;
-               else
-                       t->rendertype = SURFRENDER_OPAQUE;
-               // we don't need to set currentframe if t->animated is false because
-               // it was already set up by the texture loader for non-animating
-               if (t->animated)
-                       t->currentframe = t->anim_frames[alttextures][(t->anim_total[alttextures] >= 2) ? (texframe % t->anim_total[alttextures]) : 0];
-       }
-}
-
-void R_PrepareSurfaces(entity_render_t *ent)
-{
-       int i, numsurfaces, *surfacevisframes;
-       model_t *model;
-       msurface_t *surf, *surfaces, **surfchain;
-       vec3_t modelorg;
-
-       if (!ent->model)
-               return;
-
-       model = ent->model;
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-       numsurfaces = model->brushq1.nummodelsurfaces;
-       surfaces = model->brushq1.surfaces + model->brushq1.firstmodelsurface;
-       surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
-
-       R_UpdateTextureInfo(ent);
-
-       if (r_dynamic.integer && !r_shadow_realtime_dlight.integer)
-               R_MarkLights(ent);
-
-       if (model->brushq1.light_ambient != r_ambient.value)
-       {
-               model->brushq1.light_ambient = r_ambient.value;
-               for (i = 0;i < model->brushq1.nummodelsurfaces;i++)
-                       model->brushq1.surfaces[i + model->brushq1.firstmodelsurface].cached_dlight = true;
-       }
-       else
-       {
-               for (i = 0;i < model->brushq1.light_styles;i++)
-               {
-                       if (model->brushq1.light_stylevalue[i] != d_lightstylevalue[model->brushq1.light_style[i]])
-                       {
-                               model->brushq1.light_stylevalue[i] = d_lightstylevalue[model->brushq1.light_style[i]];
-                               for (surfchain = model->brushq1.light_styleupdatechains[i];*surfchain;surfchain++)
-                                       (**surfchain).cached_dlight = true;
-                       }
-               }
-       }
-
-       for (i = 0, surf = surfaces;i < numsurfaces;i++, surf++)
-       {
-               if (surfacevisframes[i] == r_framecount)
-               {
-#if !WORLDNODECULLBACKFACES
-                       // mark any backface surfaces as not visible
-                       if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
-                       {
-                               if (!(surf->flags & SURF_PLANEBACK))
-                                       surfacevisframes[i] = -1;
-                       }
-                       else
-                       {
-                               if ((surf->flags & SURF_PLANEBACK))
-                                       surfacevisframes[i] = -1;
-                       }
-                       if (surfacevisframes[i] == r_framecount)
-#endif
-                       {
-                               c_faces++;
-                               surf->visframe = r_framecount;
-                               if (surf->cached_dlight && surf->lightmaptexture != NULL)
-                                       R_BuildLightMap(ent, surf);
-                       }
-               }
-       }
-}
-
-void R_DrawSurfaces(entity_render_t *ent, int type, msurface_t ***chains)
-{
-       int i;
-       texture_t *t;
-       if (ent->model == NULL)
-               return;
-       R_Mesh_Matrix(&ent->matrix);
-       for (i = 0, t = ent->model->brushq1.textures;i < ent->model->brushq1.numtextures;i++, t++)
-               if (t->shader->shaderfunc[type] && t->currentframe && chains[i] != NULL)
-                       t->shader->shaderfunc[type](ent, t->currentframe, chains[i]);
-}
-
-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->brushq1.portals + calldata2;
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       R_Mesh_Matrix(&ent->matrix);
-
-       memset(&m, 0, sizeof(m));
-       m.pointer_vertex = varray_vertex3f;
-       R_Mesh_State(&m);
-
-       i = portal - ent->model->brushq1.portals;
+       i = calldata2;
        GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f),
                         ((i & 0x0038) >> 3) * (1.0f / 7.0f),
                         ((i & 0x01C0) >> 6) * (1.0f / 7.0f),
@@ -1538,384 +1292,203 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
        else
                for (i = 0, v = varray_vertex3f;i < portal->numpoints;i++, v += 3)
                        VectorCopy(portal->points[i].position, v);
+       GL_LockArrays(0, portal->numpoints);
        R_Mesh_Draw(portal->numpoints, portal->numpoints - 2, polygonelements);
+       GL_LockArrays(0, 0);
 }
 
 // LordHavoc: this is just a nice debugging tool, very slow
-static void R_DrawPortals(entity_render_t *ent)
+static void R_DrawPortals(void)
 {
-       int i;
-       mportal_t *portal, *endportal;
-       float temp[3], center[3], f;
-       if (ent->model == NULL)
+       int i, portalnum;
+       mportal_t *portal;
+       float center[3], f;
+       model_t *model = r_refdef.worldmodel;
+       if (model == NULL)
                return;
-       for (portal = ent->model->brushq1.portals, endportal = portal + ent->model->brushq1.numportals;portal < endportal;portal++)
+       for (portalnum = 0, portal = model->brush.data_portals;portalnum < model->brush.num_portals;portalnum++, portal++)
        {
                if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
+               if (!R_CullBox(portal->mins, portal->maxs))
                {
-                       VectorClear(temp);
+                       VectorClear(center);
                        for (i = 0;i < portal->numpoints;i++)
-                               VectorAdd(temp, portal->points[i].position, temp);
+                               VectorAdd(center, portal->points[i].position, center);
                        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->brushq1.portals);
-               }
-       }
-}
-
-void R_PrepareBrushModel(entity_render_t *ent)
-{
-       int i, numsurfaces, *surfacevisframes, *surfacepvsframes;
-       msurface_t *surf;
-       model_t *model;
-#if WORLDNODECULLBACKFACES
-       vec3_t modelorg;
-#endif
-
-       // because bmodels can be reused, we have to decide which things to render
-       // from scratch every time
-       model = ent->model;
-       if (model == NULL)
-               return;
-#if WORLDNODECULLBACKFACES
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-#endif
-       numsurfaces = model->brushq1.nummodelsurfaces;
-       surf = model->brushq1.surfaces + model->brushq1.firstmodelsurface;
-       surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
-       surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.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))
-                               surfacevisframes[i] = r_framecount;
+                       VectorScale(center, f, center);
+                       R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, portal, portalnum);
                }
-               else if (!(surf->flags & SURF_PLANEBACK))
-                       surfacevisframes[i] = r_framecount;
-#else
-               surfacevisframes[i] = r_framecount;
-#endif
-               surf->dlightframe = -1;
        }
-       R_PrepareSurfaces(ent);
-}
-
-void R_SurfaceWorldNode (entity_render_t *ent)
-{
-       int i, *surfacevisframes, *surfacepvsframes, surfnum;
-       msurface_t *surf;
-       mleaf_t *leaf;
-       model_t *model;
-       vec3_t modelorg;
-
-       // equivilant to quake's RecursiveWorldNode but faster and more effective
-       model = ent->model;
-       if (model == NULL)
-               return;
-       surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
-       surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.firstmodelsurface;
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-
-       for (leaf = model->brushq1.pvsleafchain;leaf;leaf = leaf->pvschain)
-       {
-               if (!R_CullBox (leaf->mins, leaf->maxs))
-               {
-                       c_leafs++;
-                       leaf->visframe = r_framecount;
-               }
-       }
-
-       for (i = 0;i < model->brushq1.pvssurflistlength;i++)
-       {
-               surfnum = model->brushq1.pvssurflist[i];
-               surf = model->brushq1.surfaces + surfnum;
-#if WORLDNODECULLBACKFACES
-               if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
-               {
-                       if ((surf->flags & SURF_PLANEBACK) && !R_CullBox (surf->poly_mins, surf->poly_maxs))
-                               surfacevisframes[surfnum] = r_framecount;
-               }
-               else
-               {
-                       if (!(surf->flags & SURF_PLANEBACK) && !R_CullBox (surf->poly_mins, surf->poly_maxs))
-                               surfacevisframes[surfnum] = r_framecount;
-               }
-#else
-               if (!R_CullBox (surf->poly_mins, surf->poly_maxs))
-                       surfacevisframes[surfnum] = r_framecount;
-#endif
-       }
-}
-
-static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
-{
-       int c, leafstackpos, *mark, *surfacevisframes;
-#if WORLDNODECULLBACKFACES
-       int n;
-       msurface_t *surf;
-#endif
-       mleaf_t *leaf, *leafstack[8192];
-       mportal_t *p;
-       vec3_t modelorg;
-       msurface_t *surfaces;
-       if (ent->model == NULL)
-               return;
-       // 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->brushq1.surfaces;
-       surfacevisframes = ent->model->brushq1.surfacevisframes;
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-       viewleaf->worldnodeframe = r_framecount;
-       leafstack[0] = viewleaf;
-       leafstackpos = 1;
-       while (leafstackpos)
-       {
-               c_leafs++;
-               leaf = leafstack[--leafstackpos];
-               leaf->visframe = r_framecount;
-               // draw any surfaces bounding this leaf
-               if (leaf->nummarksurfaces)
-               {
-                       for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
-                       {
-#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_CullBox is absolute, should be done relative
-                                       if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs))
-                                               leafstack[leafstackpos++] = leaf;
-                               }
-                       }
-               }
-       }
-}
-
-void R_PVSUpdate (entity_render_t *ent, mleaf_t *viewleaf)
-{
-       int j, c, *surfacepvsframes, *mark;
-       mleaf_t *leaf;
-       model_t *model;
-
-       model = ent->model;
-       if (model && (model->brushq1.pvsviewleaf != viewleaf || model->brushq1.pvsviewleafnovis != r_novis.integer))
-       {
-               model->brushq1.pvsframecount++;
-               model->brushq1.pvsviewleaf = viewleaf;
-               model->brushq1.pvsviewleafnovis = r_novis.integer;
-               model->brushq1.pvsleafchain = NULL;
-               model->brushq1.pvssurflistlength = 0;
-               if (viewleaf)
-               {
-                       surfacepvsframes = model->brushq1.surfacepvsframes;
-                       for (j = 0, leaf = model->brushq1.data_leafs;j < model->brushq1.num_leafs;j++, leaf++)
-                       {
-                               if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex))
-                               {
-                                       leaf->pvsframe = model->brushq1.pvsframecount;
-                                       leaf->pvschain = model->brushq1.pvsleafchain;
-                                       model->brushq1.pvsleafchain = leaf;
-                                       // mark surfaces bounding this leaf as visible
-                                       for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--, mark++)
-                                               surfacepvsframes[*mark] = model->brushq1.pvsframecount;
-                               }
-                       }
-                       model->brushq1.BuildPVSTextureChains(model);
-               }
-       }
-}
-
-void R_WorldVisibility(entity_render_t *ent)
-{
-       vec3_t modelorg;
-       mleaf_t *viewleaf;
-
-       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-       viewleaf = (ent->model && ent->model->brushq1.PointInLeaf) ? ent->model->brushq1.PointInLeaf(ent->model, modelorg) : NULL;
-       R_PVSUpdate(ent, viewleaf);
-
-       if (!viewleaf)
-               return;
-
-       if (r_surfaceworldnode.integer || viewleaf->contents == CONTENTS_SOLID)
-               R_SurfaceWorldNode (ent);
-       else
-               R_PortalWorldNode (ent, viewleaf);
 }
 
-void R_DrawWorld(entity_render_t *ent)
+void R_WorldVisibility(void)
 {
-       if (ent->model == NULL)
+       model_t *model = r_refdef.worldmodel;
+
+       if (!model)
                return;
-       if (!ent->model->brushq1.num_leafs)
+
+       if (model->type == mod_brushq3)
        {
-               if (ent->model->DrawSky)
-                       ent->model->DrawSky(ent);
-               if (ent->model->Draw)
-                       ent->model->Draw(ent);
+               int i, j;
+               mleaf_t *leaf;
+               memset(r_worldsurfacevisible, 0, r_refdef.worldmodel->brush.num_surfaces);
+               for (j = 0, leaf = r_refdef.worldmodel->brush.data_leafs;j < r_refdef.worldmodel->brush.num_leafs;j++, leaf++)
+               {
+                       if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs))
+                       {
+                               c_leafs++;
+                               for (i = 0;i < leaf->numleafsurfaces;i++)
+                                       r_worldsurfacevisible[leaf->firstleafsurface[i]] = 1;
+                       }
+               }
        }
-       else
+       else if (model->type == mod_brushq1)
        {
-               R_PrepareSurfaces(ent);
-               R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->brushq1.pvstexturechains);
-               R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->brushq1.pvstexturechains);
+               int i, j, *mark;
+               mleaf_t *leaf;
+               mleaf_t *viewleaf;
+               int leafstackpos;
+               mportal_t *p;
+               mleaf_t *leafstack[8192];
+               qbyte leafvisited[32768];
+
+               viewleaf = model->brushq1.PointInLeaf(model, r_vieworigin);
+               if (!viewleaf)
+                       return;
+
+               memset(r_worldsurfacevisible, 0, r_refdef.worldmodel->brush.num_surfaces);
+               if (viewleaf->clusterindex < 0 || r_surfaceworldnode.integer)
+               {
+                       // equivilant to quake's RecursiveWorldNode but faster and more effective
+                       for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++)
+                       {
+                               if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex) && !R_CullBox (leaf->mins, leaf->maxs))
+                               {
+                                       c_leafs++;
+                                       if (leaf->numleafsurfaces)
+                                               for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++)
+                                                       r_worldsurfacevisible[*mark] = true;
+                               }
+                       }
+               }
+               else
+               {
+                       // 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
+                       leafstack[0] = viewleaf;
+                       leafstackpos = 1;
+                       memset(leafvisited, 0, r_refdef.worldmodel->brush.num_leafs);
+                       while (leafstackpos)
+                       {
+                               c_leafs++;
+                               leaf = leafstack[--leafstackpos];
+                               leafvisited[leaf - r_refdef.worldmodel->brush.data_leafs] = 1;
+                               // draw any surfaces bounding this leaf
+                               if (leaf->numleafsurfaces)
+                                       for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++)
+                                               r_worldsurfacevisible[*mark] = true;
+                               // follow portals into other leafs
+                               for (p = leaf->portals;p;p = p->next)
+                                       if (DotProduct(r_vieworigin, p->plane.normal) < (p->plane.dist + 1) && !leafvisited[p->past - r_refdef.worldmodel->brush.data_leafs] && CHECKPVSBIT(r_pvsbits, p->past->clusterindex) && !R_CullBox(p->mins, p->maxs))
+                                               leafstack[leafstackpos++] = p->past;
+                       }
+               }
+
                if (r_drawportals.integer)
-                       R_DrawPortals(ent);
+                       R_DrawPortals();
        }
 }
 
-void R_Model_Brush_DrawSky(entity_render_t *ent)
+void R_Q1BSP_DrawSky(entity_render_t *ent)
 {
        if (ent->model == NULL)
                return;
-       if (ent != &cl_entities[0].render)
-               R_PrepareBrushModel(ent);
-       R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->brushq1.pvstexturechains);
+       R_DrawSurfaces(ent, true);
 }
 
-void R_Model_Brush_Draw(entity_render_t *ent)
+void R_Q1BSP_Draw(entity_render_t *ent)
 {
        if (ent->model == NULL)
                return;
        c_bmodels++;
-       if (ent != &cl_entities[0].render)
-               R_PrepareBrushModel(ent);
-       R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->brushq1.pvstexturechains);
+       R_DrawSurfaces(ent, false);
 }
 
-void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelightorigin, float lightradius)
+void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer)
 {
-#if 0
-       int i;
-       msurface_t *surf;
-       float projectdistance, f, temp[3], lightradius2;
-       if (ent->model == NULL)
-               return;
-       R_Mesh_Matrix(&ent->matrix);
-       lightradius2 = lightradius * lightradius;
-       R_UpdateTextureInfo(ent);
-       projectdistance = lightradius + ent->model->radius;//projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
-       //projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
-       for (i = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;i < ent->model->brushq1.nummodelsurfaces;i++, surf++)
-       {
-               if (surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && surf->flags & SURF_SHADOWCAST)
-               {
-                       f = PlaneDiff(relativelightorigin, surf->plane);
-                       if (surf->flags & SURF_PLANEBACK)
-                               f = -f;
-                       // draw shadows only for frontfaces and only if they are close
-                       if (f >= 0.1 && f < lightradius)
-                       {
-                               temp[0] = bound(surf->poly_mins[0], relativelightorigin[0], surf->poly_maxs[0]) - relativelightorigin[0];
-                               temp[1] = bound(surf->poly_mins[1], relativelightorigin[1], surf->poly_maxs[1]) - relativelightorigin[1];
-                               temp[2] = bound(surf->poly_mins[2], relativelightorigin[2], surf->poly_maxs[2]) - relativelightorigin[2];
-                               if (DotProduct(temp, temp) < lightradius2)
-                                       R_Shadow_VolumeFromSphere(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_vertex3f, surf->mesh.data_element3i, surf->mesh.data_neighbor3i, relativelightorigin, projectdistance, lightradius);
-                       }
-               }
-       }
-#else
-       int t, leafnum, marksurfnum, trianglenum;
+       model_t *model = ent->model;
+       vec3_t lightmins, lightmaxs;
+       int t, leafindex, leafsurfaceindex, surfaceindex, triangleindex, outnumclusters = 0, outnumsurfaces = 0;
        const int *e;
-       msurface_t *surf;
+       const float *v[3];
+       msurface_t *surface;
        mleaf_t *leaf;
        const qbyte *pvs;
-       float projectdistance;
-       const float *v[3];
-       vec3_t lightmins, lightmaxs;
-       if (ent->model == NULL)
-               return;
-       R_Mesh_Matrix(&ent->matrix);
-       R_UpdateTextureInfo(ent);
-       projectdistance = lightradius + ent->model->radius;//projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
        lightmins[0] = relativelightorigin[0] - lightradius;
        lightmins[1] = relativelightorigin[1] - lightradius;
        lightmins[2] = relativelightorigin[2] - lightradius;
        lightmaxs[0] = relativelightorigin[0] + lightradius;
        lightmaxs[1] = relativelightorigin[1] + lightradius;
        lightmaxs[2] = relativelightorigin[2] + lightradius;
-       /*
-       R_Shadow_PrepareShadowMark(ent->model->brush.shadowmesh->numtriangles);
-       maxmarksurfaces = sizeof(surfacelist) / sizeof(surfacelist[0]);
-       ent->model->brushq1.GetVisible(ent->model, relativelightorigin, lightmins, lightmaxs, 0, NULL, NULL, maxmarkleafs, markleaf, &nummarkleafs);
-       for (marksurfacenum = 0;marksurfacenum < nummarksurfaces;marksurfacenum++)
+       *outnumclusterspointer = 0;
+       *outnumsurfacespointer = 0;
+       memset(outclusterpvs, 0, model->brush.num_pvsclusterbytes);
+       memset(outsurfacepvs, 0, (model->nummodelsurfaces + 7) >> 3);
+       if (model == NULL)
        {
-               surf = marksurface[marksurfacenum];
-               if (surf->shadowmark != shadowmarkcount)
-               {
-                       surf->shadowmark = shadowmarkcount;
-                       if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && (surf->flags & SURF_SHADOWCAST))
+               VectorCopy(lightmins, outmins);
+               VectorCopy(lightmaxs, outmaxs);
+               return;
+       }
+       VectorCopy(relativelightorigin, outmins);
+       VectorCopy(relativelightorigin, outmaxs);
+       if (model->brush.GetPVS)
+               pvs = model->brush.GetPVS(model, relativelightorigin);
+       else
+               pvs = NULL;
+       // FIXME: use BSP recursion as lights are often small
+       for (leafindex = 0, leaf = model->brush.data_leafs;leafindex < model->brush.num_leafs;leafindex++, leaf++)
+       {
+               if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && (pvs == NULL || CHECKPVSBIT(pvs, leaf->clusterindex)))
+               {
+                       outmins[0] = min(outmins[0], leaf->mins[0]);
+                       outmins[1] = min(outmins[1], leaf->mins[1]);
+                       outmins[2] = min(outmins[2], leaf->mins[2]);
+                       outmaxs[0] = max(outmaxs[0], leaf->maxs[0]);
+                       outmaxs[1] = max(outmaxs[1], leaf->maxs[1]);
+                       outmaxs[2] = max(outmaxs[2], leaf->maxs[2]);
+                       if (outclusterpvs)
                        {
-                               for (trianglenum = 0, t = surf->num_firstshadowmeshtriangle, e = ent->model->brush.shadowmesh->element3i + t * 3;trianglenum < surf->mesh.num_triangles;trianglenum++, t++, e += 3)
+                               if (!CHECKPVSBIT(outclusterpvs, leaf->clusterindex))
                                {
-                                       v[0] = ent->model->brush.shadowmesh->vertex3f + e[0] * 3;
-                                       v[1] = ent->model->brush.shadowmesh->vertex3f + e[1] * 3;
-                                       v[2] = ent->model->brush.shadowmesh->vertex3f + e[2] * 3;
-                                       if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
-                                               shadowmarklist[numshadowmark++] = t;
+                                       SETPVSBIT(outclusterpvs, leaf->clusterindex);
+                                       outclusterlist[outnumclusters++] = leaf->clusterindex;
                                }
                        }
-               }
-       }
-       */
-       R_Shadow_PrepareShadowMark(ent->model->brush.shadowmesh->numtriangles);
-       if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
-       {
-               pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
-               // FIXME: use BSP recursion in q1bsp as dlights are often small
-               for (leafnum = 0, leaf = ent->model->brushq1.data_leafs;leafnum < ent->model->brushq1.num_leafs;leafnum++, leaf++)
-               {
-                       if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
+                       if (outsurfacepvs)
                        {
-                               for (marksurfnum = 0;marksurfnum < leaf->nummarksurfaces;marksurfnum++)
+                               for (leafsurfaceindex = 0;leafsurfaceindex < leaf->numleafsurfaces;leafsurfaceindex++)
                                {
-                                       surf = ent->model->brushq1.surfaces + leaf->firstmarksurface[marksurfnum];
-                                       if (surf->shadowmark != shadowmarkcount)
+                                       surfaceindex = leaf->firstleafsurface[leafsurfaceindex];
+                                       if (!CHECKPVSBIT(outsurfacepvs, surfaceindex))
                                        {
-                                               surf->shadowmark = shadowmarkcount;
-                                               if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && (surf->flags & SURF_SHADOWCAST))
+                                               surface = model->brush.data_surfaces + surfaceindex;
+                                               if (BoxesOverlap(lightmins, lightmaxs, surface->mins, surface->maxs) && (surface->texture->flags & SURF_LIGHTMAP) && !surface->texture->skin.fog)
                                                {
-                                                       for (trianglenum = 0, t = surf->num_firstshadowmeshtriangle, e = ent->model->brush.shadowmesh->element3i + t * 3;trianglenum < surf->mesh.num_triangles;trianglenum++, t++, e += 3)
+                                                       for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->mesh.num_triangles;triangleindex++, t++, e += 3)
                                                        {
-                                                               v[0] = ent->model->brush.shadowmesh->vertex3f + e[0] * 3;
-                                                               v[1] = ent->model->brush.shadowmesh->vertex3f + e[1] * 3;
-                                                               v[2] = ent->model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                                               v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                                               v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                                               v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3;
                                                                if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
-                                                                       shadowmarklist[numshadowmark++] = t;
+                                                               {
+                                                                       SETPVSBIT(outsurfacepvs, surfaceindex);
+                                                                       outsurfacelist[outnumsurfaces++] = surfaceindex;
+                                                                       break;
+                                                               }
                                                        }
                                                }
                                        }
@@ -1923,85 +1496,78 @@ void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelighto
                        }
                }
        }
-       else
+
+       // limit combined leaf box to light boundaries
+       outmins[0] = max(outmins[0], lightmins[0]);
+       outmins[1] = max(outmins[1], lightmins[1]);
+       outmins[2] = max(outmins[2], lightmins[2]);
+       outmaxs[0] = min(outmaxs[0], lightmaxs[0]);
+       outmaxs[1] = min(outmaxs[1], lightmaxs[1]);
+       outmaxs[2] = min(outmaxs[2], lightmaxs[2]);
+
+       *outnumclusterspointer = outnumclusters;
+       *outnumsurfacespointer = outnumsurfaces;
+}
+
+void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist)
+{
+       model_t *model = ent->model;
+       vec3_t lightmins, lightmaxs;
+       msurface_t *surface;
+       int surfacelistindex;
+       if (r_drawcollisionbrushes.integer < 2)
        {
-               for (marksurfnum = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;marksurfnum < ent->model->brushq1.nummodelsurfaces;marksurfnum++, surf++)
+               lightmins[0] = relativelightorigin[0] - lightradius;
+               lightmins[1] = relativelightorigin[1] - lightradius;
+               lightmins[2] = relativelightorigin[2] - lightradius;
+               lightmaxs[0] = relativelightorigin[0] + lightradius;
+               lightmaxs[1] = relativelightorigin[1] + lightradius;
+               lightmaxs[2] = relativelightorigin[2] + lightradius;
+               R_Mesh_Matrix(&ent->matrix);
+               R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
+               for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
                {
-                       if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && (surf->flags & SURF_SHADOWCAST))
-                       {
-                               for (trianglenum = 0, t = surf->num_firstshadowmeshtriangle, e = ent->model->brush.shadowmesh->element3i + t * 3;trianglenum < surf->mesh.num_triangles;trianglenum++, t++, e += 3)
-                               {
-                                       v[0] = ent->model->brush.shadowmesh->vertex3f + e[0] * 3;
-                                       v[1] = ent->model->brush.shadowmesh->vertex3f + e[1] * 3;
-                                       v[2] = ent->model->brush.shadowmesh->vertex3f + e[2] * 3;
-                                       if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
-                                               shadowmarklist[numshadowmark++] = t;
-                               }
-                       }
+                       surface = model->brush.data_surfaces + surfacelist[surfacelistindex];
+                       R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->mesh.num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
                }
+               R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, lightradius + model->radius + r_shadow_projectdistance.value, numshadowmark, shadowmarklist);
        }
-       R_Shadow_VolumeFromList(ent->model->brush.shadowmesh->numverts, ent->model->brush.shadowmesh->numtriangles, ent->model->brush.shadowmesh->vertex3f, ent->model->brush.shadowmesh->element3i, ent->model->brush.shadowmesh->neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
-#endif
 }
 
-void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap)
+void R_Q1BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist)
 {
-       int leafnum, marksurfnum;
-       msurface_t *surf;
-       mleaf_t *leaf;
-       const qbyte *pvs;
+       model_t *model = ent->model;
+       vec3_t lightmins, lightmaxs, modelorg;
+       msurface_t *surface;
        texture_t *t;
-       float lightmins[3], lightmaxs[3];
-       if (ent->model == NULL)
-               return;
-       R_Mesh_Matrix(&ent->matrix);
-       lightmins[0] = relativelightorigin[0] - lightradius;
-       lightmins[1] = relativelightorigin[1] - lightradius;
-       lightmins[2] = relativelightorigin[2] - lightradius;
-       lightmaxs[0] = relativelightorigin[0] + lightradius;
-       lightmaxs[1] = relativelightorigin[1] + lightradius;
-       lightmaxs[2] = relativelightorigin[2] + lightradius;
-       R_UpdateTextureInfo(ent);
-       shadowmarkcount++;
-       if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
+       int surfacelistindex;
+       if (r_drawcollisionbrushes.integer < 2)
        {
-               pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
-               for (leafnum = 0, leaf = ent->model->brushq1.data_leafs;leafnum < ent->model->brushq1.num_leafs;leafnum++, leaf++)
+               lightmins[0] = relativelightorigin[0] - lightradius;
+               lightmins[1] = relativelightorigin[1] - lightradius;
+               lightmins[2] = relativelightorigin[2] - lightradius;
+               lightmaxs[0] = relativelightorigin[0] + lightradius;
+               lightmaxs[1] = relativelightorigin[1] + lightradius;
+               lightmaxs[2] = relativelightorigin[2] + lightradius;
+               R_Mesh_Matrix(&ent->matrix);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+               R_UpdateTextureInfo(ent);
+               for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
                {
-                       if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
+                       surface = model->brush.data_surfaces + surfacelist[surfacelistindex];
+                       if (r_shadow_compilingrtlight)
                        {
-                               for (marksurfnum = 0;marksurfnum < leaf->nummarksurfaces;marksurfnum++)
-                               {
-                                       surf = ent->model->brushq1.surfaces + leaf->firstmarksurface[marksurfnum];
-                                       if (surf->shadowmark != shadowmarkcount)
-                                       {
-                                               surf->shadowmark = shadowmarkcount;
-                                               if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && (ent != &cl_entities[0].render || surf->visframe == r_framecount))
-                                               {
-                                                       t = surf->texinfo->texture->currentframe;
-                                                       if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
-                                                       {
-                                                               R_Shadow_DiffuseLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, lightcubemap);
-                                                               R_Shadow_SpecularLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, lightcubemap);
-                                                       }
-                                               }
-                                       }
-                               }
+                               // if compiling an rtlight, capture the mesh
+                               t = surface->texture;
+                               if (t->flags & SURF_LIGHTMAP && t->skin.fog == NULL)
+                                       Mod_ShadowMesh_AddMesh(r_shadow_mempool, r_shadow_compilingrtlight->static_meshchain_light, surface->texture->skin.base, surface->texture->skin.gloss, surface->texture->skin.nmap, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, surface->mesh.num_triangles, surface->mesh.data_element3i);
                        }
-               }
-       }
-       else
-       {
-               for (marksurfnum = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;marksurfnum < ent->model->brushq1.nummodelsurfaces;marksurfnum++, surf++)
-               {
-                       if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && (ent != &cl_entities[0].render || surf->visframe == r_framecount))
+                       else if (ent != r_refdef.worldentity || r_worldsurfacevisible[surface - ent->model->brush.data_surfaces])
                        {
-                               t = surf->texinfo->texture->currentframe;
-                               if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
-                               {
-                                       R_Shadow_DiffuseLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, lightcubemap);
-                                       R_Shadow_SpecularLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, lightcubemap);
-                               }
+                               t = surface->texture->currentframe;
+                               // FIXME: transparent surfaces need to be lit later
+                               if (t->flags & SURF_LIGHTMAP && t->rendertype == SURFRENDER_OPAQUE)
+                                       R_Shadow_RenderLighting(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, t->skin.gloss, lightcubemap, ambientscale, diffusescale, specularscale);
                        }
                }
        }
@@ -2014,567 +1580,643 @@ void R_DrawCollisionBrush(colbrushf_t *brush)
        memset(&m, 0, sizeof(m));
        m.pointer_vertex = brush->points->v;
        R_Mesh_State(&m);
-       i = ((int)brush) / sizeof(colbrushf_t);
+       i = (int)(((size_t)brush) / sizeof(colbrushf_t));
        GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f);
+       GL_LockArrays(0, brush->numpoints);
        R_Mesh_Draw(brush->numpoints, brush->numtriangles, brush->elements);
+       GL_LockArrays(0, 0);
 }
 
-void R_Q3BSP_DrawCollisionFace(entity_render_t *ent, q3mface_t *face)
+void R_Q3BSP_DrawCollisionSurface(entity_render_t *ent, msurface_t *surface)
 {
        int i;
        rmeshstate_t m;
-       if (!face->num_collisiontriangles)
+       if (!surface->mesh.num_collisiontriangles)
                return;
        memset(&m, 0, sizeof(m));
-       m.pointer_vertex = face->data_collisionvertex3f;
+       m.pointer_vertex = surface->mesh.data_collisionvertex3f;
        R_Mesh_State(&m);
-       i = ((int)face) / sizeof(q3mface_t);
+       i = (int)(((size_t)surface) / sizeof(msurface_t));
        GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f);
-       R_Mesh_Draw(face->num_collisionvertices, face->num_collisiontriangles, face->data_collisionelement3i);
+       GL_LockArrays(0, surface->mesh.num_collisionvertices);
+       R_Mesh_Draw(surface->mesh.num_collisionvertices, surface->mesh.num_collisiontriangles, surface->mesh.data_collisionelement3i);
+       GL_LockArrays(0, 0);
 }
 
-void R_Q3BSP_DrawSkyFace(entity_render_t *ent, q3mface_t *face)
+void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int surfacenumber)
 {
+       const entity_render_t *ent = voident;
+       msurface_t *surface = ent->model->brush.data_surfaces + surfacenumber;
        rmeshstate_t m;
-       if (!face->num_triangles)
-               return;
-       c_faces++;
-       if (skyrendernow)
-       {
-               skyrendernow = false;
-               if (skyrendermasked)
-                       R_Sky();
-       }
-
        R_Mesh_Matrix(&ent->matrix);
-
-       GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1);
-       if (skyrendermasked)
-       {
-               // depth-only (masking)
-               GL_ColorMask(0,0,0,0);
-               // just to make sure that braindead drivers don't draw anything
-               // despite that colormask...
-               GL_BlendFunc(GL_ZERO, GL_ONE);
-       }
-       else
-       {
-               // fog sky
-               GL_BlendFunc(GL_ONE, GL_ZERO);
-       }
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-
-       memset(&m, 0, sizeof(m));
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-       GL_ColorMask(1,1,1,1);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(entity_render_t *ent, q3mface_t *face)
-{
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       if (face->texture->skin.glow)
-       {
-               m.tex[0] = R_GetTexture(face->texture->skin.glow);
-               m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-               GL_Color(1, 1, 1, 1);
-       }
-       else
-               GL_Color(0, 0, 0, 1);
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(entity_render_t *ent, q3mface_t *face)
-{
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->texture->skin.base);
-       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-       m.tex[1] = R_GetTexture(face->lightmaptexture);
-       m.pointer_texcoord[1] = face->data_texcoordlightmap2f;
-       m.texrgbscale[1] = 2;
-       GL_Color(1, 1, 1, 1);
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(entity_render_t *ent, q3mface_t *face)
-{
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->texture->skin.base);
-       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-       GL_Color(1, 1, 1, 1);
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(entity_render_t *ent, q3mface_t *face)
-{
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->lightmaptexture);
-       m.pointer_texcoord[0] = face->data_texcoordlightmap2f;
-       GL_Color(1, 1, 1, 1);
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_LightmapOnly(entity_render_t *ent, q3mface_t *face)
-{
-       rmeshstate_t m;
        memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->lightmaptexture);
-       m.pointer_texcoord[0] = face->data_texcoordlightmap2f;
-       if (r_shadow_realtime_world.integer)
-               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
+       if ((ent->effects & EF_ADDITIVE) || (surface->texture->textureflags & Q3TEXTUREFLAG_ADDITIVE))
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        else
-               GL_Color(1, 1, 1, 1);
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(entity_render_t *ent, q3mface_t *face)
-{
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        GL_DepthMask(false);
-       GL_DepthTest(true);
-       if (face->texture->skin.glow)
-       {
-               m.tex[0] = R_GetTexture(face->texture->skin.glow);
-               m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-               GL_Color(1, 1, 1, 1);
-       }
-       else
-               GL_Color(0, 0, 0, 1);
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(entity_render_t *ent, q3mface_t *face)
-{
-       int i;
-       float mul;
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->texture->skin.base);
-       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-       mul = 2.0f;
-       if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value != 1)
-               mul *= r_shadow_realtime_world_lightmaps.value;
-       if (mul == 2 && gl_combine.integer)
+       GL_DepthTest(!(ent->effects & EF_NODEPTHTEST));
+       m.tex[0] = R_GetTexture(surface->texture->skin.base);
+       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+       // LordHavoc: quake3 was not able to do this; lit transparent surfaces
+       if (gl_combine.integer)
        {
                m.texrgbscale[0] = 2;
-               m.pointer_color = face->data_color4f;
-       }
-       else if (mul == 1)
-               m.pointer_color = face->data_color4f;
-       else
-       {
-               for (i = 0;i < face->num_vertices;i++)
+               if (r_textureunits.integer >= 2)
                {
-                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * mul;
-                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * mul;
-                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * mul;
-                       varray_color4f[i*4+3] = face->data_color4f[i*4+3];
+                       m.tex[1] = R_GetTexture(surface->lightmaptexture);
+                       m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f;
+                       GL_Color(ent->colormod[0], ent->colormod[1], ent->colormod[2], ent->alpha);
+               }
+               else
+               {
+                       if (ent->colormod[0] == 1 && ent->colormod[1] == 1 && ent->colormod[2] == 1 && ent->alpha == 1)
+                               m.pointer_color = surface->mesh.data_lightmapcolor4f;
+                       else
+                       {
+                               int i;
+                               for (i = 0;i < surface->mesh.num_vertices;i++)
+                               {
+                                       varray_color4f[i*4+0] = surface->mesh.data_lightmapcolor4f[i*4+0] * ent->colormod[0];
+                                       varray_color4f[i*4+1] = surface->mesh.data_lightmapcolor4f[i*4+1] * ent->colormod[1];
+                                       varray_color4f[i*4+2] = surface->mesh.data_lightmapcolor4f[i*4+2] * ent->colormod[2];
+                                       varray_color4f[i*4+3] = surface->mesh.data_lightmapcolor4f[i*4+3] * ent->alpha;
+                               }
+                               m.pointer_color = varray_color4f;
+                       }
                }
-               m.pointer_color = varray_color4f;
        }
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_VertexOnly(entity_render_t *ent, q3mface_t *face)
-{
-       int i;
-       float mul;
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ZERO);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       mul = 2.0f;
-       if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value != 1)
-               mul *= r_shadow_realtime_world_lightmaps.value;
-       if (mul == 1)
-               m.pointer_color = face->data_color4f;
        else
        {
-               for (i = 0;i < face->num_vertices;i++)
+               int i;
+               for (i = 0;i < surface->mesh.num_vertices;i++)
                {
-                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
-                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
-                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
-                       varray_color4f[i*4+3] = face->data_color4f[i*4+3];
+                       varray_color4f[i*4+0] = surface->mesh.data_lightmapcolor4f[i*4+0] * ent->colormod[0] * 2.0f;
+                       varray_color4f[i*4+1] = surface->mesh.data_lightmapcolor4f[i*4+1] * ent->colormod[1] * 2.0f;
+                       varray_color4f[i*4+2] = surface->mesh.data_lightmapcolor4f[i*4+2] * ent->colormod[2] * 2.0f;
+                       varray_color4f[i*4+3] = surface->mesh.data_lightmapcolor4f[i*4+3] * ent->alpha;
                }
                m.pointer_color = varray_color4f;
        }
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3mface_t *face)
-{
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       GL_BlendFunc(GL_ONE, GL_ONE);
-       GL_DepthMask(true);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->texture->skin.base);
-       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-       GL_Color(r_ambient.value * (1.0f / 128.0f), r_ambient.value * (1.0f / 128.0f), r_ambient.value * (1.0f / 128.0f), 1);
-       m.pointer_vertex = face->data_vertex3f;
+       if (surface->texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2))
+       {
+               int i, j;
+               float center[3], center2[3], forward[3], right[3], up[3], v[4][3];
+               matrix4x4_t matrix1, imatrix1;
+               R_Mesh_Matrix(&r_identitymatrix);
+               // a single autosprite surface can contain multiple sprites...
+               for (j = 0;j < surface->mesh.num_vertices - 3;j += 4)
+               {
+                       VectorClear(center);
+                       for (i = 0;i < 4;i++)
+                               VectorAdd(center, surface->mesh.data_vertex3f + (j+i) * 3, center);
+                       VectorScale(center, 0.25f, center);
+                       Matrix4x4_Transform(&ent->matrix, center, center2);
+                       // FIXME: calculate vectors from triangle edges instead of using texture vectors as an easy way out?
+                       Matrix4x4_FromVectors(&matrix1, surface->mesh.data_normal3f + j*3, surface->mesh.data_svector3f + j*3, surface->mesh.data_tvector3f + j*3, center);
+                       Matrix4x4_Invert_Simple(&imatrix1, &matrix1);
+                       for (i = 0;i < 4;i++)
+                               Matrix4x4_Transform(&imatrix1, surface->mesh.data_vertex3f + (j+i)*3, v[i]);
+                       if (surface->texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE2)
+                       {
+                               forward[0] = r_vieworigin[0] - center2[0];
+                               forward[1] = r_vieworigin[1] - center2[1];
+                               forward[2] = 0;
+                               VectorNormalize(forward);
+                               right[0] = forward[1];
+                               right[1] = -forward[0];
+                               right[2] = 0;
+                               up[0] = 0;
+                               up[1] = 0;
+                               up[2] = 1;
+                       }
+                       else
+                       {
+                               VectorCopy(r_viewforward, forward);
+                               VectorCopy(r_viewright, right);
+                               VectorCopy(r_viewup, up);
+                       }
+                       for (i = 0;i < 4;i++)
+                               VectorMAMAMAM(1, center2, v[i][0], forward, v[i][1], right, v[i][2], up, varray_vertex3f + (i+j) * 3);
+               }
+               m.pointer_vertex = varray_vertex3f;
+       }
+       else
+               m.pointer_vertex = surface->mesh.data_vertex3f;
        R_Mesh_State(&m);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-}
-
-void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber)
-{
-       const entity_render_t *ent = voident;
-       q3mface_t *face = ent->model->brushq3.data_faces + facenumber;
+       if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED)
+               qglDisable(GL_CULL_FACE);
+       GL_LockArrays(0, surface->mesh.num_vertices);
+       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+       GL_LockArrays(0, 0);
+       if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED)
+               qglEnable(GL_CULL_FACE);
+}
+
+void R_Q3BSP_DrawFaceList(entity_render_t *ent, texture_t *t, int texturenumsurfaces, msurface_t **texturesurfacelist)
+{
+       int i, texturesurfaceindex;
+       msurface_t *surface;
+       qboolean dolightmap;
+       qboolean dobase;
+       qboolean doambient;
+       qboolean doglow;
+       qboolean dofog;
        rmeshstate_t m;
-       R_Mesh_Matrix(&ent->matrix);
-       memset(&m, 0, sizeof(m));
-       if (ent->effects & EF_ADDITIVE)
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-       else
-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       GL_DepthMask(false);
-       GL_DepthTest(true);
-       m.tex[0] = R_GetTexture(face->texture->skin.base);
-       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-       // LordHavoc: quake3 was not able to do this; lit transparent surfaces
-       if (gl_combine.integer)
+       if (!texturenumsurfaces)
+               return;
+       c_faces += texturenumsurfaces;
+       // gl_lightmaps debugging mode skips normal texturing
+       if (gl_lightmaps.integer)
        {
-               m.texrgbscale[0] = 2;
-               if (r_textureunits.integer >= 2)
-               {
-                       m.tex[1] = R_GetTexture(face->lightmaptexture);
-                       m.pointer_texcoord[1] = face->data_texcoordlightmap2f;
-                       GL_Color(1, 1, 1, ent->alpha);
-               }
-               else
+               GL_DepthMask(true);
+               GL_DepthTest(true);
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               qglDisable(GL_CULL_FACE);
+               memset(&m, 0, sizeof(m));
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                {
-                       if (ent->alpha == 1)
-                               m.pointer_color = face->data_color4f;
-                       else
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.tex[0] = R_GetTexture(surface->lightmaptexture);
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordlightmap2f;
+                       if (surface->lightmaptexture)
                        {
-                               int i;
-                               for (i = 0;i < face->num_vertices;i++)
-                               {
-                                       varray_color4f[i*4+0] = face->data_color4f[i*4+0];
-                                       varray_color4f[i*4+1] = face->data_color4f[i*4+1];
-                                       varray_color4f[i*4+2] = face->data_color4f[i*4+2];
-                                       varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
-                               }
-                               m.pointer_color = varray_color4f;
+                               GL_Color(1, 1, 1, 1);
+                               m.pointer_color = NULL;
                        }
+                       else
+                               m.pointer_color = surface->mesh.data_lightmapcolor4f;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
+               qglEnable(GL_CULL_FACE);
+               return;
        }
-       else
+       // transparent surfaces get sorted for later drawing
+       if ((t->surfaceparms & Q3SURFACEPARM_TRANS) || ent->alpha < 1 || (ent->effects & EF_ADDITIVE))
        {
-               int i;
-               for (i = 0;i < face->num_vertices;i++)
+               vec3_t facecenter, center;
+               // drawing sky transparently would be too difficult
+               if (t->surfaceparms & Q3SURFACEPARM_SKY)
+                       return;
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                {
-                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
-                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
-                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
-                       varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       facecenter[0] = (surface->mins[0] + surface->maxs[0]) * 0.5f;
+                       facecenter[1] = (surface->mins[1] + surface->maxs[1]) * 0.5f;
+                       facecenter[2] = (surface->mins[2] + surface->maxs[2]) * 0.5f;
+                       Matrix4x4_Transform(&ent->matrix, facecenter, center);
+                       R_MeshQueue_AddTransparent(center, R_Q3BSP_DrawFace_TransparentCallback, ent, surface - ent->model->brush.data_surfaces);
                }
-               m.pointer_color = varray_color4f;
-       }
-       m.pointer_vertex = face->data_vertex3f;
-       R_Mesh_State(&m);
-       qglDisable(GL_CULL_FACE);
-       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
-       qglEnable(GL_CULL_FACE);
-}
-
-void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
-{
-       if (!face->num_triangles)
                return;
-       if (face->texture->surfaceparms)
-       {
-               if (face->texture->surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NODRAW))
-                       return;
        }
-       c_faces++;
-       face->visframe = r_framecount;
-       if ((face->texture->surfaceparms & Q3SURFACEPARM_TRANS) || ent->alpha < 1 || (ent->effects & EF_ADDITIVE))
+       // sky surfaces draw sky if needed and render themselves as a depth mask
+       if (t->surfaceparms & Q3SURFACEPARM_SKY)
        {
-               vec3_t facecenter, center;
-               facecenter[0] = (face->mins[0] + face->maxs[0]) * 0.5f;
-               facecenter[1] = (face->mins[1] + face->maxs[1]) * 0.5f;
-               facecenter[2] = (face->mins[2] + face->maxs[2]) * 0.5f;
-               Matrix4x4_Transform(&ent->matrix, facecenter, center);
-               R_MeshQueue_AddTransparent(center, R_Q3BSP_DrawFace_TransparentCallback, ent, face - ent->model->brushq3.data_faces);
+               if (skyrendernow)
+               {
+                       skyrendernow = false;
+                       if (skyrendermasked)
+                               R_Sky();
+               }
+               if (!r_q3bsp_renderskydepth.integer)
+                       return;
+
+               R_Mesh_Matrix(&ent->matrix);
+
+               GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1);
+               if (skyrendermasked)
+               {
+                       // depth-only (masking)
+                       GL_ColorMask(0,0,0,0);
+                       // just to make sure that braindead drivers don't draw anything
+                       // despite that colormask...
+                       GL_BlendFunc(GL_ZERO, GL_ONE);
+               }
+               else
+               {
+                       // fog sky
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+               }
+               GL_DepthMask(true);
+               GL_DepthTest(true);
+
+               memset(&m, 0, sizeof(m));
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
+               GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
                return;
        }
-       R_Mesh_Matrix(&ent->matrix);
-       if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0)
-               R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(ent, face);
-       else if ((ent->effects & EF_FULLBRIGHT) || r_fullbright.integer)
+       // anything else is a typical wall, lightmap * texture + glow
+       dolightmap = (ent->flags & RENDER_LIGHT);
+       dobase = true;
+       doambient = r_ambient.value > 0;
+       doglow = t->skin.glow != NULL;
+       dofog = fogenabled;
+       if (t->textureflags & Q3TEXTUREFLAG_TWOSIDED)
+               qglDisable(GL_CULL_FACE);
+       if (!dolightmap && dobase)
+       {
+               dolightmap = false;
+               dobase = false;
+               GL_DepthMask(true);
+               GL_DepthTest(true);
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               GL_Color(ent->colormod[0], ent->colormod[1], ent->colormod[2], 1);
+               if (t->textureflags & Q3TEXTUREFLAG_TWOSIDED)
+                       qglDisable(GL_CULL_FACE);
+               memset(&m, 0, sizeof(m));
+               m.tex[0] = R_GetTexture(t->skin.base);
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
+       }
+       if (r_lightmapintensity <= 0 && dolightmap && dobase)
        {
-               R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(ent, face);
-               if (face->texture->skin.glow)
-                       R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face);
+               dolightmap = false;
+               dobase = false;
+               GL_DepthMask(true);
+               GL_DepthTest(true);
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               GL_Color(0, 0, 0, 1);
+               memset(&m, 0, sizeof(m));
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
        }
-       else if (face->lightmaptexture)
+       if (r_textureunits.integer >= 2 && gl_combine.integer && dolightmap && dobase)
        {
-               if (gl_lightmaps.integer)
-                       R_Q3BSP_DrawFace_OpaqueWall_Pass_LightmapOnly(ent, face);
+               // dualtexture combine
+               dolightmap = false;
+               dobase = false;
+               GL_DepthMask(true);
+               GL_DepthTest(true);
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               memset(&m, 0, sizeof(m));
+               m.tex[0] = R_GetTexture(t->skin.base);
+               GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1);
+               m.pointer_color = NULL;
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       if (!surface->lightmaptexture)
+                               continue;
+                       m.tex[1] = R_GetTexture(surface->lightmaptexture);
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                       m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f;
+                       m.texrgbscale[1] = 2;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
+               if (r_lightmapintensity == 1 && ent->colormod[0] == 1 && ent->colormod[1] == 1 && ent->colormod[2] == 1)
+               {
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+                       {
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               if (surface->lightmaptexture)
+                                       continue;
+                               m.tex[1] = R_GetTexture(surface->lightmaptexture);
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f;
+                               m.texrgbscale[1] = 2;
+                               m.pointer_color = surface->mesh.data_lightmapcolor4f;
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
+                       }
+               }
                else
                {
-                       if (r_textureunits.integer >= 2 && gl_combine.integer)
-                               R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(ent, face);
-                       else
+                       for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                        {
-                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(ent, face);
-                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(ent, face);
+                               surface = texturesurfacelist[texturesurfaceindex];
+                               if (surface->lightmaptexture)
+                                       continue;
+                               m.tex[1] = R_GetTexture(surface->lightmaptexture);
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                               m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f;
+                               m.texrgbscale[1] = 2;
+                               m.pointer_color = varray_color4f;
+                               for (i = 0;i < surface->mesh.num_vertices;i++)
+                               {
+                                       varray_color4f[i*4+0] = surface->mesh.data_lightmapcolor4f[i*4+0] * ent->colormod[0] * r_lightmapintensity;
+                                       varray_color4f[i*4+1] = surface->mesh.data_lightmapcolor4f[i*4+1] * ent->colormod[1] * r_lightmapintensity;
+                                       varray_color4f[i*4+2] = surface->mesh.data_lightmapcolor4f[i*4+2] * ent->colormod[2] * r_lightmapintensity;
+                                       varray_color4f[i*4+3] = surface->mesh.data_lightmapcolor4f[i*4+3];
+                               }
+                               m.pointer_vertex = surface->mesh.data_vertex3f;
+                               R_Mesh_State(&m);
+                               GL_LockArrays(0, surface->mesh.num_vertices);
+                               R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                               GL_LockArrays(0, 0);
                        }
-                       if (face->texture->skin.glow)
-                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face);
                }
        }
-       else
+       // single texture
+       if (dolightmap)
        {
-               if (gl_lightmaps.integer)
-                       R_Q3BSP_DrawFace_OpaqueWall_Pass_VertexOnly(ent, face);
-               else
+               GL_DepthMask(true);
+               GL_DepthTest(true);
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               memset(&m, 0, sizeof(m));
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                {
-                       R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(ent, face);
-                       if (face->texture->skin.glow)
-                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face);
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.tex[0] = R_GetTexture(surface->lightmaptexture);
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordlightmap2f;
+                       if (surface->lightmaptexture)
+                               m.pointer_color = NULL;
+                       else
+                               m.pointer_color = surface->mesh.data_lightmapcolor4f;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
-       if (r_ambient.value)
-               R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(ent, face);
-}
-
-void R_Q3BSP_RecursiveWorldNode(entity_render_t *ent, q3mnode_t *node, const vec3_t modelorg, qbyte *pvs, int markframe)
-{
-       int i;
-       q3mleaf_t *leaf;
-       for (;;)
+       if (dobase)
        {
-               if (R_CullBox(node->mins, node->maxs))
-                       return;
-               if (!node->plane)
-                       break;
-               c_nodes++;
-               R_Q3BSP_RecursiveWorldNode(ent, node->children[0], modelorg, pvs, markframe);
-               node = node->children[1];
+               GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+               GL_DepthMask(false);
+               GL_DepthTest(true);
+               GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1);
+               memset(&m, 0, sizeof(m));
+               m.tex[0] = R_GetTexture(t->skin.base);
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
        }
-       leaf = (q3mleaf_t *)node;
-       if (CHECKPVSBIT(pvs, leaf->clusterindex))
+       if (doambient)
        {
-               c_leafs++;
-               for (i = 0;i < leaf->numleaffaces;i++)
-                       leaf->firstleafface[i]->markframe = markframe;
+               GL_BlendFunc(GL_ONE, GL_ONE);
+               GL_DepthMask(false);
+               GL_DepthTest(true);
+               GL_Color(r_ambient.value * (1.0f / 128.0f) * ent->colormod[0], r_ambient.value * (1.0f / 128.0f) * ent->colormod[1], r_ambient.value * (1.0f / 128.0f) * ent->colormod[2], 1);
+               memset(&m, 0, sizeof(m));
+               m.tex[0] = R_GetTexture(t->skin.base);
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
+               {
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
        }
-}
-
-// FIXME: num_leafs needs to be recalculated at load time to include only
-// node-referenced leafs, as some maps are incorrectly compiled with leafs for
-// the submodels (which would render the submodels occasionally, as part of
-// the world - not good)
-void R_Q3BSP_MarkLeafPVS(entity_render_t *ent, qbyte *pvs, int markframe)
-{
-       int i, j;
-       q3mleaf_t *leaf;
-       for (j = 0, leaf = ent->model->brushq3.data_leafs;j < ent->model->brushq3.num_leafs;j++, leaf++)
+       if (doglow)
        {
-               if (CHECKPVSBIT(pvs, leaf->clusterindex))
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               GL_DepthMask(false);
+               GL_DepthTest(true);
+               GL_Color(1, 1, 1, 1);
+               memset(&m, 0, sizeof(m));
+               m.tex[0] = R_GetTexture(t->skin.glow);
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                {
-                       c_leafs++;
-                       for (i = 0;i < leaf->numleaffaces;i++)
-                               leaf->firstleafface[i]->markframe = markframe;
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
-}
-
-static int r_q3bsp_framecount = -1;
-
-void R_Q3BSP_DrawSky(entity_render_t *ent)
-{
-       int i;
-       q3mface_t *face;
-       vec3_t modelorg;
-       model_t *model;
-       qbyte *pvs;
-       R_Mesh_Matrix(&ent->matrix);
-       model = ent->model;
-       if (r_drawcollisionbrushes.integer < 2)
+       if (dofog)
        {
+               float modelorg[3];
                Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-               if (ent == &cl_entities[0].render && model->brush.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg)))
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               GL_DepthMask(false);
+               GL_DepthTest(true);
+               GL_Color(1, 1, 1, 1);
+               memset(&m, 0, sizeof(m));
+               m.tex[0] = R_GetTexture(t->skin.fog);
+               m.pointer_color = varray_color4f;
+               for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++)
                {
-                       if (r_q3bsp_framecount != r_framecount)
-                       {
-                               r_q3bsp_framecount = r_framecount;
-                               R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, r_framecount);
-                               //R_Q3BSP_MarkLeafPVS(ent, pvs, r_framecount);
-                       }
-                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                               if (face->markframe == r_framecount && (face->texture->surfaceflags & Q3SURFACEFLAG_SKY) && !R_CullBox(face->mins, face->maxs))
-                                       R_Q3BSP_DrawSkyFace(ent, face);
+                       surface = texturesurfacelist[texturesurfaceindex];
+                       if (m.tex[0])
+                               m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f;
+                       m.pointer_vertex = surface->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       RSurf_FogPassColors_Vertex3f_Color4f(surface->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, 1, surface->mesh.num_vertices, modelorg);
+                       GL_LockArrays(0, surface->mesh.num_vertices);
+                       R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
-               else
-                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                               if ((face->texture->surfaceflags & Q3SURFACEFLAG_SKY))
-                                       R_Q3BSP_DrawSkyFace(ent, face);
        }
+       if (t->textureflags & Q3TEXTUREFLAG_TWOSIDED)
+               qglEnable(GL_CULL_FACE);
 }
 
-void R_Q3BSP_Draw(entity_render_t *ent)
+void R_Q3BSP_DrawFaces(entity_render_t *ent, int skyfaces)
 {
-       int i;
-       q3mface_t *face;
-       vec3_t modelorg;
-       model_t *model;
-       qbyte *pvs;
+       int i, j, f, flagsmask, flags;
+       msurface_t *surface;
+       model_t *model = ent->model;
+       texture_t *t;
+       const int maxfaces = 1024;
+       int numsurfaces = 0;
+       msurface_t *surfacelist[1024];
        R_Mesh_Matrix(&ent->matrix);
-       model = ent->model;
-       if (r_drawcollisionbrushes.integer < 2)
+       flagsmask = Q3SURFACEFLAG_NODRAW | Q3SURFACEFLAG_SKY;
+       if (skyfaces)
+               flags = Q3SURFACEFLAG_SKY;
+       else
+               flags = 0;
+       t = NULL;
+       f = 0;
+       numsurfaces = 0;
+       for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
        {
-               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-               if (ent == &cl_entities[0].render && model->brush.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg)))
+               if (ent != r_refdef.worldentity || r_worldsurfacevisible[j])
                {
-                       if (r_q3bsp_framecount != r_framecount)
+                       surface = model->brush.data_surfaces + j;
+                       if (t != surface->texture)
+                       {
+                               if (numsurfaces)
+                               {
+                                       R_Q3BSP_DrawFaceList(ent, t, numsurfaces, surfacelist);
+                                       numsurfaces = 0;
+                               }
+                               t = surface->texture;
+                               f = t->surfaceflags & flagsmask;
+                       }
+                       if (f == flags)
                        {
-                               r_q3bsp_framecount = r_framecount;
-                               R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, r_framecount);
-                               //R_Q3BSP_MarkLeafPVS(ent, pvs, r_framecount);
+                               if (!surface->mesh.num_triangles)
+                                       continue;
+                               surfacelist[numsurfaces++] = surface;
+                               if (numsurfaces >= maxfaces)
+                               {
+                                       R_Q3BSP_DrawFaceList(ent, t, numsurfaces, surfacelist);
+                                       numsurfaces = 0;
+                               }
                        }
-                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                               if (face->markframe == r_framecount && !R_CullBox(face->mins, face->maxs))
-                                       R_Q3BSP_DrawFace(ent, face);
                }
-               else
-                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                               R_Q3BSP_DrawFace(ent, face);
        }
+       if (numsurfaces)
+               R_Q3BSP_DrawFaceList(ent, t, numsurfaces, surfacelist);
+}
+
+void R_Q3BSP_DrawSky(entity_render_t *ent)
+{
+       if (r_drawcollisionbrushes.integer < 2)
+               R_Q3BSP_DrawFaces(ent, true);
+}
+
+void R_Q3BSP_Draw(entity_render_t *ent)
+{
+       if (r_drawcollisionbrushes.integer < 2)
+               R_Q3BSP_DrawFaces(ent, false);
        if (r_drawcollisionbrushes.integer >= 1)
        {
+               int i;
+               model_t *model = ent->model;
+               msurface_t *surface;
+               q3mbrush_t *brush;
                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
                GL_DepthMask(false);
                GL_DepthTest(true);
                qglPolygonOffset(r_drawcollisionbrushes_polygonfactor.value, r_drawcollisionbrushes_polygonoffset.value);
-               for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-                       if (model->brushq3.data_thismodel->firstbrush[i].colbrushf && model->brushq3.data_thismodel->firstbrush[i].colbrushf->numtriangles)
-                               R_DrawCollisionBrush(model->brushq3.data_thismodel->firstbrush[i].colbrushf);
-               for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                       if (face->num_collisiontriangles)
-                               R_Q3BSP_DrawCollisionFace(ent, face);
+               for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+                       if (brush->colbrushf && brush->colbrushf->numtriangles)
+                               R_DrawCollisionBrush(brush->colbrushf);
+               for (i = 0, surface = model->brush.data_surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surface++)
+                       if (surface->mesh.num_collisiontriangles)
+                               R_Q3BSP_DrawCollisionSurface(ent, surface);
                qglPolygonOffset(0, 0);
        }
 }
 
-void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius)
+void R_Q3BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer)
 {
-#if 0
-       int i;
-       q3mface_t *face;
-       vec3_t modelorg, lightmins, lightmaxs;
-       model_t *model;
-       float projectdistance;
-       projectdistance = lightradius + ent->model->radius;//projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
-       if (r_drawcollisionbrushes.integer < 2)
-       {
-               model = ent->model;
-               R_Mesh_Matrix(&ent->matrix);
-               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-               lightmins[0] = relativelightorigin[0] - lightradius;
-               lightmins[1] = relativelightorigin[1] - lightradius;
-               lightmins[2] = relativelightorigin[2] - lightradius;
-               lightmaxs[0] = relativelightorigin[0] + lightradius;
-               lightmaxs[1] = relativelightorigin[1] + lightradius;
-               lightmaxs[2] = relativelightorigin[2] + lightradius;
-               //if (ent == &cl_entities[0].render && model->brush.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg)))
-               //      R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, ++markframe);
-               //else
-                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                               if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs))
-                                       R_Shadow_VolumeFromSphere(face->num_vertices, face->num_triangles, face->data_vertex3f, face->data_element3i, face->data_neighbor3i, relativelightorigin, projectdistance, lightradius);
-       }
-#else
-       int j, t, leafnum, marksurfnum;
+       model_t *model = ent->model;
+       vec3_t lightmins, lightmaxs;
+       int t, leafindex, leafsurfaceindex, surfaceindex, triangleindex, outnumclusters = 0, outnumsurfaces = 0;
        const int *e;
-       const qbyte *pvs;
        const float *v[3];
-       q3mface_t *face;
-       q3mleaf_t *leaf;
-       vec3_t modelorg, lightmins, lightmaxs;
-       model_t *model;
-       float projectdistance;
-       projectdistance = lightradius + ent->model->radius;//projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
-       if (r_drawcollisionbrushes.integer < 2)
+       msurface_t *surface;
+       mleaf_t *leaf;
+       const qbyte *pvs;
+       lightmins[0] = relativelightorigin[0] - lightradius;
+       lightmins[1] = relativelightorigin[1] - lightradius;
+       lightmins[2] = relativelightorigin[2] - lightradius;
+       lightmaxs[0] = relativelightorigin[0] + lightradius;
+       lightmaxs[1] = relativelightorigin[1] + lightradius;
+       lightmaxs[2] = relativelightorigin[2] + lightradius;
+       *outnumclusterspointer = 0;
+       *outnumsurfacespointer = 0;
+       memset(outclusterpvs, 0, model->brush.num_pvsclusterbytes);
+       memset(outsurfacepvs, 0, (model->nummodelsurfaces + 7) >> 3);
+       if (model == NULL)
        {
-               model = ent->model;
-               R_Mesh_Matrix(&ent->matrix);
-               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
-               lightmins[0] = relativelightorigin[0] - lightradius;
-               lightmins[1] = relativelightorigin[1] - lightradius;
-               lightmins[2] = relativelightorigin[2] - lightradius;
-               lightmaxs[0] = relativelightorigin[0] + lightradius;
-               lightmaxs[1] = relativelightorigin[1] + lightradius;
-               lightmaxs[2] = relativelightorigin[2] + lightradius;
-               R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
-               if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
-               {       
-                       for (leafnum = 0, leaf = ent->model->brushq3.data_leafs;leafnum < ent->model->brushq3.num_leafs;leafnum++, leaf++)
+               VectorCopy(lightmins, outmins);
+               VectorCopy(lightmaxs, outmaxs);
+               return;
+       }
+       VectorCopy(relativelightorigin, outmins);
+       VectorCopy(relativelightorigin, outmaxs);
+       if (model->brush.GetPVS)
+               pvs = model->brush.GetPVS(model, relativelightorigin);
+       else
+               pvs = NULL;
+       // FIXME: use BSP recursion as lights are often small
+       for (leafindex = 0, leaf = model->brush.data_leafs;leafindex < model->brush.num_leafs;leafindex++, leaf++)
+       {
+               if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && (pvs == NULL || CHECKPVSBIT(pvs, leaf->clusterindex)))
+               {
+                       outmins[0] = min(outmins[0], leaf->mins[0]);
+                       outmins[1] = min(outmins[1], leaf->mins[1]);
+                       outmins[2] = min(outmins[2], leaf->mins[2]);
+                       outmaxs[0] = max(outmaxs[0], leaf->maxs[0]);
+                       outmaxs[1] = max(outmaxs[1], leaf->maxs[1]);
+                       outmaxs[2] = max(outmaxs[2], leaf->maxs[2]);
+                       if (outclusterpvs)
+                       {
+                               if (!CHECKPVSBIT(outclusterpvs, leaf->clusterindex))
+                               {
+                                       SETPVSBIT(outclusterpvs, leaf->clusterindex);
+                                       outclusterlist[outnumclusters++] = leaf->clusterindex;
+                               }
+                       }
+                       if (outsurfacepvs)
                        {
-                               if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
+                               for (leafsurfaceindex = 0;leafsurfaceindex < leaf->numleafsurfaces;leafsurfaceindex++)
                                {
-                                       for (marksurfnum = 0;marksurfnum < leaf->numleaffaces;marksurfnum++)
+                                       surfaceindex = leaf->firstleafsurface[leafsurfaceindex];
+                                       surface = model->brush.data_surfaces + surfaceindex;
+                                       if (!CHECKPVSBIT(outsurfacepvs, surfaceindex))
                                        {
-                                               face = leaf->firstleafface[marksurfnum];
-                                               if (face->shadowmark != shadowmarkcount)
+                                               if (BoxesOverlap(lightmins, lightmaxs, surface->mins, surface->maxs) && !(surface->texture->surfaceparms & Q3SURFACEPARM_TRANS) && !(surface->texture->surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NODRAW)) && surface->mesh.num_triangles)
                                                {
-                                                       face->shadowmark = shadowmarkcount;
-                                                       if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs))
+                                                       if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED)
                                                        {
-                                                               for (j = 0, t = face->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;j < face->num_triangles;j++, t++, e += 3)
+                                                               for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->mesh.num_triangles;triangleindex++, t++, e += 3)
+                                                               {
+                                                                       v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                                                       v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                                                       v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                                                       if (lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
+                                                                       {
+                                                                               SETPVSBIT(outsurfacepvs, surfaceindex);
+                                                                               outsurfacelist[outnumsurfaces++] = surfaceindex;
+                                                                               break;
+                                                                       }
+                                                               }
+                                                       }
+                                                       else
+                                                       {
+                                                               for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->mesh.num_triangles;triangleindex++, t++, e += 3)
                                                                {
                                                                        v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3;
                                                                        v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3;
                                                                        v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3;
                                                                        if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
-                                                                               shadowmarklist[numshadowmark++] = t;
+                                                                       {
+                                                                               SETPVSBIT(outsurfacepvs, surfaceindex);
+                                                                               outsurfacelist[outnumsurfaces++] = surfaceindex;
+                                                                               break;
+                                                                       }
                                                                }
                                                        }
                                                }
@@ -2582,87 +2224,84 @@ void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin,
                                }
                        }
                }
-               else
-               {
-                       for (marksurfnum = 0, face = model->brushq3.data_thismodel->firstface;marksurfnum < model->brushq3.data_thismodel->numfaces;marksurfnum++, face++)
-                       {
-                               if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs))
-                               {
-                                       for (j = 0, t = face->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;j < face->num_triangles;j++, t++, e += 3)
-                                       {
-                                               v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3;
-                                               v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3;
-                                               v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3;
-                                               if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
-                                                       shadowmarklist[numshadowmark++] = t;
-                                       }
-                               }
-                       }
-               }
-               R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
        }
-#endif
+
+       // limit combined leaf box to light boundaries
+       outmins[0] = max(outmins[0], lightmins[0]);
+       outmins[1] = max(outmins[1], lightmins[1]);
+       outmins[2] = max(outmins[2], lightmins[2]);
+       outmaxs[0] = min(outmaxs[0], lightmaxs[0]);
+       outmaxs[1] = min(outmaxs[1], lightmaxs[1]);
+       outmaxs[2] = min(outmaxs[2], lightmaxs[2]);
+
+       *outnumclusterspointer = outnumclusters;
+       *outnumsurfacespointer = outnumsurfaces;
 }
 
-void R_Q3BSP_DrawFaceLight(entity_render_t *ent, q3mface_t *face, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap)
+void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist)
 {
-       if ((face->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) || !face->num_triangles)
-               return;
-       R_Shadow_DiffuseLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.base, face->texture->skin.nmap, lightcubemap);
-       R_Shadow_SpecularLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.gloss, face->texture->skin.nmap, lightcubemap);
+       model_t *model = ent->model;
+       vec3_t lightmins, lightmaxs;
+       msurface_t *surface;
+       int surfacelistindex;
+       if (r_drawcollisionbrushes.integer < 2)
+       {
+               lightmins[0] = relativelightorigin[0] - lightradius;
+               lightmins[1] = relativelightorigin[1] - lightradius;
+               lightmins[2] = relativelightorigin[2] - lightradius;
+               lightmaxs[0] = relativelightorigin[0] + lightradius;
+               lightmaxs[1] = relativelightorigin[1] + lightradius;
+               lightmaxs[2] = relativelightorigin[2] + lightradius;
+               R_Mesh_Matrix(&ent->matrix);
+               R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
+               for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+               {
+                       surface = model->brush.data_surfaces + surfacelist[surfacelistindex];
+                       // FIXME: check some manner of surface->rendermode here?
+                       if (!(surface->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) && !(surface->texture->surfaceparms & (Q3SURFACEPARM_SKY | Q3SURFACEPARM_TRANS)) && !(surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED))
+                               R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->mesh.num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
+               }
+               R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, lightradius + model->radius + r_shadow_projectdistance.value, numshadowmark, shadowmarklist);
+       }
 }
 
-void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap)
+void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist)
 {
-       int leafnum, marksurfnum;
-       const qbyte *pvs;
-       q3mface_t *face;
-       q3mleaf_t *leaf;
-       vec3_t modelorg, lightmins, lightmaxs;
-       model_t *model;
-       //qbyte *pvs;
-       //static int markframe = 0;
+       model_t *model = ent->model;
+       vec3_t lightmins, lightmaxs, modelorg;
+       msurface_t *surface;
+       int surfacelistindex;
        if (r_drawcollisionbrushes.integer < 2)
        {
-               model = ent->model;
-               R_Mesh_Matrix(&ent->matrix);
-               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
                lightmins[0] = relativelightorigin[0] - lightradius;
                lightmins[1] = relativelightorigin[1] - lightradius;
                lightmins[2] = relativelightorigin[2] - lightradius;
                lightmaxs[0] = relativelightorigin[0] + lightradius;
                lightmaxs[1] = relativelightorigin[1] + lightradius;
                lightmaxs[2] = relativelightorigin[2] + lightradius;
-
-               if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
-               {       
-                       pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
-                       for (leafnum = 0, leaf = ent->model->brushq3.data_leafs;leafnum < ent->model->brushq3.num_leafs;leafnum++, leaf++)
+               R_Mesh_Matrix(&ent->matrix);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+               for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+               {
+                       surface = model->brush.data_surfaces + surfacelist[surfacelistindex];
+                       if (r_shadow_compilingrtlight)
                        {
-                               if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
-                               {
-                                       for (marksurfnum = 0;marksurfnum < leaf->numleaffaces;marksurfnum++)
-                                       {
-                                               face = leaf->firstleafface[marksurfnum];
-                                               if (face->shadowmark != shadowmarkcount)
-                                               {
-                                                       face->shadowmark = shadowmarkcount;
-                                                       if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs) && (ent != &cl_entities[0].render || face->visframe == r_framecount))
-                                                               R_Q3BSP_DrawFaceLight(ent, face, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, lightcubemap);
-                                               }
-                                       }
-                               }
+                               // if compiling an rtlight, capture the mesh
+                               Mod_ShadowMesh_AddMesh(r_shadow_mempool, r_shadow_compilingrtlight->static_meshchain_light, surface->texture->skin.base, surface->texture->skin.gloss, surface->texture->skin.nmap, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, surface->mesh.num_triangles, surface->mesh.data_element3i);
+                       }
+                       else if (!(surface->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) && surface->mesh.num_triangles)
+                       {
+                               if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED)
+                                       qglDisable(GL_CULL_FACE);
+                               R_Shadow_RenderLighting(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, surface->texture->skin.base, surface->texture->skin.nmap, surface->texture->skin.gloss, lightcubemap, ambientscale, diffusescale, specularscale);
+                               if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED)
+                                       qglEnable(GL_CULL_FACE);
                        }
-               }
-               else
-               {
-                       for (marksurfnum = 0, face = model->brushq3.data_thismodel->firstface;marksurfnum < model->brushq3.data_thismodel->numfaces;marksurfnum++, face++)
-                               if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs) && (ent != &cl_entities[0].render || face->visframe == r_framecount))
-                                       R_Q3BSP_DrawFaceLight(ent, face, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, lightcubemap);
                }
        }
 }
 
+#if 0
 static void gl_surf_start(void)
 {
 }
@@ -2674,6 +2313,7 @@ static void gl_surf_shutdown(void)
 static void gl_surf_newmap(void)
 {
 }
+#endif
 
 void GL_Surf_Init(void)
 {
@@ -2690,8 +2330,9 @@ void GL_Surf_Init(void)
        Cvar_RegisterVariable(&r_surfaceworldnode);
        Cvar_RegisterVariable(&r_drawcollisionbrushes_polygonfactor);
        Cvar_RegisterVariable(&r_drawcollisionbrushes_polygonoffset);
+       Cvar_RegisterVariable(&r_q3bsp_renderskydepth);
        Cvar_RegisterVariable(&gl_lightmaps);
 
-       R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
+       //R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
 }