]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rsurf.c
surfvertex_t is gone, in it's place are non-interleaved arrays, which keeps things...
[xonotic/darkplaces.git] / gl_rsurf.c
index 08620f340d2b18f0bb91c6423142434b1615d7cd..43318ed9c148d7e6c396505ef93270e82012af11 100644 (file)
@@ -31,14 +31,22 @@ static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4];
 cvar_t r_ambient = {0, "r_ambient", "0"};
 cvar_t r_vertexsurfaces = {0, "r_vertexsurfaces", "0"};
 cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"};
-cvar_t r_drawportals = {0, "r_drawportals", "0"};
+//cvar_t r_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", "0"};
+cvar_t r_cullsurface = {0, "r_cullsurface", "0"};
 
 static int dlightdivtable[32768];
 
-static int R_IntAddDynamicLights (msurface_t *surf)
+// variables used by R_PVSUpdate
+int r_pvsframecount = 0;
+mleaf_t *r_pvsviewleaf = NULL;
+int r_pvsviewleafnovis = 0;
+msurface_t *r_pvsfirstsurface = NULL;
+
+static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 {
        int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract;
        unsigned int *bl;
@@ -62,7 +70,7 @@ static int R_IntAddDynamicLights (msurface_t *surf)
                if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
                        continue;                                       // not lit by this light
 
-               softwareuntransform(r_dlight[lnum].origin, local);
+               Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local);
                dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 
                // for comparisons to minimum acceptable light
@@ -139,7 +147,7 @@ static int R_IntAddDynamicLights (msurface_t *surf)
        return lit;
 }
 
-static int R_FloatAddDynamicLights (msurface_t *surf)
+static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 {
        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;
@@ -155,7 +163,7 @@ static int R_FloatAddDynamicLights (msurface_t *surf)
                if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
                        continue;                                       // not lit by this light
 
-               softwareuntransform(r_dlight[lnum].origin, local);
+               Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local);
                dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 
                // for comparisons to minimum acceptable light
@@ -280,7 +288,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int d
 
                        if (surf->dlightframe == r_framecount && r_dlightmap.integer)
                        {
-                               surf->cached_dlight = R_IntAddDynamicLights(surf);
+                               surf->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surf);
                                if (surf->cached_dlight)
                                        c_light_polys++;
                                else if (dlightchanged)
@@ -371,7 +379,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int d
 
                if (surf->dlightframe == r_framecount && r_dlightmap.integer)
                {
-                       surf->cached_dlight = R_FloatAddDynamicLights(surf);
+                       surf->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surf);
                        if (surf->cached_dlight)
                                c_light_polys++;
                        else if (dlightchanged)
@@ -587,7 +595,8 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i
        icolor[7] = ca2;
 
        model = cl.worldmodel;
-       R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor);
+       if (model)
+               R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor);
 
        // look for embedded bmodels
        for (n = 0;n < cl_num_brushmodel_entities;n++)
@@ -615,56 +624,16 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i
 =============================================================
 */
 
-static void RSurf_CopyXYZ(const surfvertex_t *in, float *out, int numverts)
-{
-       int i;
-       for (i = 0;i < numverts;i++, in++, out += 4)
-       {
-               VectorCopy(in->v, out);
-               out[3] = 1;
-       }
-}
-
-static void RSurf_CopyST(const surfvertex_t *in, float *out, int numverts)
-{
-       int i;
-       for (i = 0;i < numverts;i++, in++, out += 2)
-       {
-               out[0] = in->st[0];
-               out[1] = in->st[1];
-       }
-}
-
-static void RSurf_CopyUV(const surfvertex_t *in, float *out, int numverts)
-{
-       int i;
-       for (i = 0;i < numverts;i++, in++, out += 2)
-       {
-               out[0] = in->uv[0];
-               out[1] = in->uv[1];
-       }
-}
-
-static void RSurf_CopyAB(const surfvertex_t *in, float *out, int numverts)
-{
-       int i;
-       for (i = 0;i < numverts;i++, in++, out += 2)
-       {
-               out[0] = in->ab[0];
-               out[1] = in->ab[1];
-       }
-}
-
-static void RSurf_AddLightmapToVertexColors(const surfvertex_t *in, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles)
+static void RSurf_AddLightmapToVertexColors(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles)
 {
        int i;
        float scale;
        const qbyte *lm;
        if (styles[0] != 255)
        {
-               for (i = 0;i < numverts;i++, in++, c += 4)
+               for (i = 0;i < numverts;i++, c += 4)
                {
-                       lm = samples + in->lightmapoffset;
+                       lm = samples + lightmapoffsets[i];
                        scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f);
                        VectorMA(c, scale, lm, c);
                        if (styles[1] != 255)
@@ -749,10 +718,10 @@ static void RSurf_FogPassColors(const float *v, float *c, float r, float g, floa
        {
                VectorSubtract(v, modelorg, diff);
                f = exp(fogdensity/DotProduct(diff, diff));
-               c[0] = r * f;
-               c[1] = g * f;
-               c[2] = b * f;
-               c[3] = a;
+               c[0] = r;
+               c[1] = g;
+               c[2] = b;
+               c[3] = a * f;
        }
 }
 
@@ -770,7 +739,7 @@ static int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits,
        const float *v;
        float *c;
        int i, l, lit = false;
-       rdlight_t *rd;
+       const rdlight_t *rd;
        vec3_t lightorigin;
        for (l = 0;l < r_numdlights;l++)
        {
@@ -794,21 +763,21 @@ static int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits,
 }
 
 // note: this untransforms lights to do the checking,
-// and takes surf->mesh->vertex data
-static int RSurf_LightCheck(const int *dlightbits, surfmesh_t *mesh)
+// and takes surf->mesh->verts data
+static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, const surfmesh_t *mesh)
 {
        int i, l;
-       rdlight_t *rd;
+       const rdlight_t *rd;
        vec3_t lightorigin;
-       surfvertex_t *sv;
+       const float *v;
        for (l = 0;l < r_numdlights;l++)
        {
                if (dlightbits[l >> 5] & (1 << (l & 31)))
                {
                        rd = &r_dlight[l];
-                       softwareuntransform(rd->origin, lightorigin);
-                       for (i = 0, sv = mesh->vertex;i < mesh->numverts;i++, sv++)
-                               if (VectorDistance2(sv->v, lightorigin) < rd->cullradius2)
+                       Matrix4x4_Transform(matrix, rd->origin, lightorigin);
+                       for (i = 0, v = mesh->verts;i < mesh->numverts;i++, v += 4)
+                               if (VectorDistance2(v, lightorigin) < rd->cullradius2)
                                        return true;
                }
        }
@@ -818,7 +787,7 @@ static int RSurf_LightCheck(const int *dlightbits, surfmesh_t *mesh)
 static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firstsurf)
 {
        const msurface_t *surf;
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
 
        // LordHavoc: HalfLife maps have freaky skypolys...
@@ -828,13 +797,23 @@ static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firsts
        if (skyrendernow)
        {
                skyrendernow = false;
-               R_Sky();
+               if (skyrendermasked)
+                       R_Sky();
        }
 
        // draw depth-only polys
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_ZERO;
-       m.blendfunc2 = GL_ONE;
+       if (skyrendermasked)
+       {
+               m.blendfunc1 = GL_ZERO;
+               m.blendfunc2 = GL_ONE;
+       }
+       else
+       {
+               // fog sky
+               m.blendfunc1 = GL_ONE;
+               m.blendfunc2 = GL_ZERO;
+       }
        m.depthwrite = true;
        m.matrix = ent->matrix;
        for (surf = firstsurf;surf;surf = surf->chain)
@@ -846,8 +825,11 @@ static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firsts
                        if (R_Mesh_Draw_GetBuffer(&m, false))
                        {
                                memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                               RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
-                               memset(m.color, 0, m.numverts * sizeof(float[4]));
+                               memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                               if (skyrendermasked)
+                                       memset(m.color, 0, m.numverts * sizeof(float[4]));
+                               else
+                                       R_FillColors(m.color, m.numverts, fogcolor[0] * m.colorscale, fogcolor[1] * m.colorscale, fogcolor[2] * m.colorscale, 1);
                                R_Mesh_Render();
                        }
                }
@@ -857,9 +839,9 @@ static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firsts
 static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 {
        const entity_render_t *ent = calldata1;
-       msurface_t *surf = ent->model->surfaces + calldata2;
+       const msurface_t *surf = ent->model->surfaces + calldata2;
        float f;
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
        float modelorg[3];
@@ -890,8 +872,8 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
                if (R_Mesh_Draw_GetBuffer(&m, true))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f);
                        R_FillColors(m.color, m.numverts, f, f, f, alpha);
                        if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT))
@@ -899,7 +881,7 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
                                if (surf->dlightframe == r_framecount)
                                        RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color);
                                if (surf->flags & SURF_LIGHTMAP)
-                                       RSurf_AddLightmapToVertexColors(mesh->vertex, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
+                                       RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
                        }
                        RSurf_FogColors(m.vertex, m.color, m.colorscale, m.numverts, modelorg);
                        R_Mesh_Render();
@@ -920,9 +902,9 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
                        if (R_Mesh_Draw_GetBuffer(&m, false))
                        {
                                memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                               RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                               memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
                                if (m.tex[0])
-                                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                                RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, m.colorscale, m.numverts, modelorg);
                                R_Mesh_Render();
                        }
@@ -949,7 +931,7 @@ static void RSurfShader_Water(const entity_render_t *ent, const msurface_t *firs
 static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf)
 {
        float base;
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float modelorg[3];
        Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
@@ -979,15 +961,15 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
                if (R_Mesh_Draw_GetBuffer(&m, true))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        R_FillColors(m.color, m.numverts, base, base, base, ent->alpha);
                        if (!(ent->effects & EF_FULLBRIGHT))
                        {
                                if (surf->dlightframe == r_framecount)
                                        RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color);
                                if (surf->flags & SURF_LIGHTMAP)
-                                       RSurf_AddLightmapToVertexColors(mesh->vertex, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
+                                       RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
                        }
                        RSurf_FogColors(m.vertex, m.color, m.colorscale, m.numverts, modelorg);
                        R_Mesh_Render();
@@ -997,7 +979,7 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
 
 static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float modelorg[3];
        Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
@@ -1026,8 +1008,8 @@ static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, con
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        RSurf_FoggedColors(m.vertex, m.color, 1, 1, 1, ent->alpha, m.colorscale, m.numverts, modelorg);
                        R_Mesh_Render();
                }
@@ -1036,7 +1018,7 @@ static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, con
 
 static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float modelorg[3];
        Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
@@ -1052,8 +1034,8 @@ static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurfac
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        RSurf_FoggedColors(m.vertex, m.color, 1, 1, 1, ent->alpha, m.colorscale, m.numverts, modelorg);
                        R_Mesh_Render();
                }
@@ -1062,7 +1044,7 @@ static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurfac
 
 static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float modelorg[3];
        Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
@@ -1078,9 +1060,9 @@ static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
                        if (m.tex[0])
-                               RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                               memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha, m.colorscale, m.numverts, modelorg);
                        R_Mesh_Render();
                }
@@ -1089,10 +1071,10 @@ static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface
 
 static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
+       const surfmesh_t *mesh;
+       static rmeshbufferinfo_t m;
        float cl;
-       memset(&m, 0, sizeof(m));
+       //memset(&m, 0, sizeof(m));
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
@@ -1109,12 +1091,12 @@ static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(const entity_render_t *
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
+                       memcpy(m.texcoords[1], mesh->uv, m.numverts * sizeof(float[2]));
+                       memcpy(m.texcoords[2], mesh->ab, m.numverts * sizeof(float[2]));
                        cl = (float) (1 << lightscalebit) * m.colorscale;
                        R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
-                       RSurf_CopyUV(mesh->vertex, m.texcoords[1], m.numverts);
-                       RSurf_CopyAB(mesh->vertex, m.texcoords[2], m.numverts);
                        R_Mesh_Render();
                }
        }
@@ -1122,7 +1104,7 @@ static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(const entity_render_t *
 
 static void RSurfShader_OpaqueWall_Pass_BaseMTex(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float cl;
        memset(&m, 0, sizeof(m));
@@ -1138,11 +1120,11 @@ static void RSurfShader_OpaqueWall_Pass_BaseMTex(const entity_render_t *ent, con
                if (R_Mesh_Draw_GetBuffer(&m, true))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
+                       memcpy(m.texcoords[1], mesh->uv, m.numverts * sizeof(float[2]));
                        cl = (float) (1 << lightscalebit) * m.colorscale;
                        R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
-                       RSurf_CopyUV(mesh->vertex, m.texcoords[1], m.numverts);
                        R_Mesh_Render();
                }
        }
@@ -1150,7 +1132,7 @@ static void RSurfShader_OpaqueWall_Pass_BaseMTex(const entity_render_t *ent, con
 
 static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float cl;
        memset(&m, 0, sizeof(m));
@@ -1165,10 +1147,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent,
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        cl = m.colorscale;
                        R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
                        R_Mesh_Render();
                }
        }
@@ -1176,7 +1158,7 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent,
 
 static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float cl;
        memset(&m, 0, sizeof(m));
@@ -1191,10 +1173,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent,
                if (R_Mesh_Draw_GetBuffer(&m, true))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->uv, m.numverts * sizeof(float[2]));
                        cl = (float) (1 << lightscalebit) * m.colorscale;
                        R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
-                       RSurf_CopyUV(mesh->vertex, m.texcoords[0], m.numverts);
                        R_Mesh_Render();
                }
        }
@@ -1202,7 +1184,7 @@ static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent,
 
 static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
 
        if (surf->dlightframe != r_framecount)
@@ -1217,15 +1199,15 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const
        m.matrix = ent->matrix;
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               if (RSurf_LightCheck(surf->dlightbits, mesh))
+               if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh))
                {
                        m.numtriangles = mesh->numtriangles;
                        m.numverts = mesh->numverts;
                        if (R_Mesh_Draw_GetBuffer(&m, true))
                        {
                                memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                               RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
-                               RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                               memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                               memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                                R_FillColors(m.color, m.numverts, 0, 0, 0, 1);
                                RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color);
                                RSurf_ScaleColors(m.color, m.colorscale, m.numverts);
@@ -1237,7 +1219,7 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const
 
 static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        float modelorg[3];
        Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
@@ -1253,9 +1235,9 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const ms
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
                        if (m.tex[0])
-                               RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+                               memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], 1, m.colorscale, m.numverts, modelorg);
                        R_Mesh_Render();
                }
@@ -1264,7 +1246,7 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const ms
 
 static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
        m.blendfunc1 = GL_DST_COLOR;
@@ -1278,9 +1260,9 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->ab, m.numverts * sizeof(float[2]));
                        R_FillColors(m.color, m.numverts, 1, 1, 1, 1);
-                       RSurf_CopyAB(mesh->vertex, m.texcoords[0], m.numverts);
                        R_Mesh_Render();
                }
        }
@@ -1288,7 +1270,7 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c
 
 static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf)
 {
-       surfmesh_t *mesh;
+       const surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
        m.blendfunc1 = GL_SRC_ALPHA;
@@ -1302,9 +1284,9 @@ static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const m
                if (R_Mesh_Draw_GetBuffer(&m, false))
                {
                        memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+                       memcpy(m.vertex, mesh->verts, m.numverts * sizeof(float[4]));
+                       memcpy(m.texcoords[0], mesh->st, m.numverts * sizeof(float[2]));
                        R_FillColors(m.color, m.numverts, m.colorscale, m.colorscale, m.colorscale, 1);
-                       RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
                        R_Mesh_Render();
                }
        }
@@ -1329,7 +1311,6 @@ static void RSurfShader_Wall_Fullbright(const entity_render_t *ent, const msurfa
        {
                for (surf = firstsurf;surf;surf = surf->chain)
                {
-                       c_brush_polys++;
                        Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
                        R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces);
                }
@@ -1338,7 +1319,6 @@ static void RSurfShader_Wall_Fullbright(const entity_render_t *ent, const msurfa
        {
                for (surf = firstsurf;surf;surf = surf->chain)
                {
-                       c_brush_polys++;
                        if (surf->currenttexture->fogtexture != NULL)
                        {
                                Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
@@ -1377,7 +1357,6 @@ static void RSurfShader_Wall_Vertex(const entity_render_t *ent, const msurface_t
        {
                for (surf = firstsurf;surf;surf = surf->chain)
                {
-                       c_brush_polys++;
                        Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
                        R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
                }
@@ -1386,7 +1365,6 @@ static void RSurfShader_Wall_Vertex(const entity_render_t *ent, const msurface_t
        {
                for (surf = firstsurf;surf;surf = surf->chain)
                {
-                       c_brush_polys++;
                        if (surf->currenttexture->fogtexture != NULL)
                        {
                                Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
@@ -1414,7 +1392,6 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface
        {
                for (surf = firstsurf;surf;surf = surf->chain)
                {
-                       c_brush_polys++;
                        Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
                        R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
                }
@@ -1423,7 +1400,6 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface
        {
                for (surf = firstsurf;surf;surf = surf->chain)
                {
-                       c_brush_polys++;
                        if (surf->currenttexture->fogtexture != NULL)
                        {
                                Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
@@ -1449,7 +1425,6 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface
                        {
                                for (surf = firstsurf;surf;surf = surf->chain)
                                {
-                                       c_brush_polys++;
                                        if (surf->currenttexture->fogtexture != NULL)
                                        {
                                                Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
@@ -1463,7 +1438,6 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface
                        {
                                for (surf = firstsurf;surf;surf = surf->chain)
                                {
-                                       c_brush_polys++;
                                        if (surf->currenttexture->fogtexture != NULL)
                                        {
                                                Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
@@ -1482,7 +1456,6 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface
                {
                        for (surf = firstsurf;surf;surf = surf->chain)
                        {
-                               c_brush_polys++;
                                if (surf->currenttexture->fogtexture != NULL)
                                {
                                        Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
@@ -1515,236 +1488,6 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface
        }
 }
 
-/*
-=============================================================
-
-       WORLD MODEL
-
-=============================================================
-*/
-
-static void R_SolidWorldNode (entity_render_t *ent)
-{
-       if (r_viewleaf->contents != CONTENTS_SOLID)
-       {
-               int portalstack;
-               mportal_t *p, *pstack[8192];
-               msurface_t *surf, **mark, **endmark;
-               mleaf_t *leaf;
-               // LordHavoc: portal-passage worldnode; follows portals leading
-               // outward from viewleaf, if a portal leads offscreen it is not
-               // followed, in indoor maps this can often cull a great deal of
-               // geometry away when pvs data is not present (useful with pvs as well)
-
-               leaf = r_viewleaf;
-               leaf->worldnodeframe = r_framecount;
-               portalstack = 0;
-       loc0:
-               c_leafs++;
-
-               leaf->visframe = r_framecount;
-
-               if (leaf->nummarksurfaces)
-               {
-                       mark = leaf->firstmarksurface;
-                       endmark = mark + leaf->nummarksurfaces;
-                       do
-                       {
-                               surf = *mark++;
-                               // make sure surfaces are only processed once
-                               if (surf->worldnodeframe == r_framecount)
-                                       continue;
-                               surf->worldnodeframe = r_framecount;
-                               if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
-                               {
-                                       if (surf->flags & SURF_PLANEBACK)
-                                               surf->visframe = r_framecount;
-                               }
-                               else
-                               {
-                                       if (!(surf->flags & SURF_PLANEBACK))
-                                               surf->visframe = r_framecount;
-                               }
-                       }
-                       while (mark < endmark);
-               }
-
-               // follow portals into other leafs
-               p = leaf->portals;
-               for (;p;p = p->next)
-               {
-                       if (DotProduct(r_origin, p->plane.normal) < p->plane.dist)
-                       {
-                               leaf = p->past;
-                               if (leaf->worldnodeframe != r_framecount)
-                               {
-                                       leaf->worldnodeframe = r_framecount;
-                                       if (leaf->contents != CONTENTS_SOLID)
-                                       {
-                                               if (R_NotCulledBox(leaf->mins, leaf->maxs))
-                                               {
-                                                       p->visframe = r_framecount;
-                                                       pstack[portalstack++] = p;
-                                                       goto loc0;
-
-       loc1:
-                                                       p = pstack[--portalstack];
-                                               }
-                                       }
-                               }
-                       }
-               }
-
-               if (portalstack)
-                       goto loc1;
-       }
-       else
-       {
-               mnode_t *nodestack[8192], *node = cl.worldmodel->nodes;
-               int nodestackpos = 0;
-               // LordHavoc: recursive descending worldnode; if portals are not
-               // available, this is a good last resort, can cull large amounts of
-               // geometry, but is more time consuming than portal-passage and renders
-               // things behind walls
-
-loc2:
-               if (R_NotCulledBox(node->mins, node->maxs))
-               {
-                       if (node->numsurfaces)
-                       {
-                               msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces;
-                               if (PlaneDiff (r_origin, node->plane) < 0)
-                               {
-                                       for (;surf < surfend;surf++)
-                                       {
-                                               if (surf->flags & SURF_PLANEBACK)
-                                                       surf->visframe = r_framecount;
-                                       }
-                               }
-                               else
-                               {
-                                       for (;surf < surfend;surf++)
-                                       {
-                                               if (!(surf->flags & SURF_PLANEBACK))
-                                                       surf->visframe = r_framecount;
-                                       }
-                               }
-                       }
-
-                       // recurse down the children
-                       if (node->children[0]->contents >= 0)
-                       {
-                               if (node->children[1]->contents >= 0)
-                               {
-                                       if (nodestackpos < 8192)
-                                               nodestack[nodestackpos++] = node->children[1];
-                                       node = node->children[0];
-                                       goto loc2;
-                               }
-                               else
-                                       ((mleaf_t *)node->children[1])->visframe = r_framecount;
-                               node = node->children[0];
-                               goto loc2;
-                       }
-                       else
-                       {
-                               ((mleaf_t *)node->children[0])->visframe = r_framecount;
-                               if (node->children[1]->contents >= 0)
-                               {
-                                       node = node->children[1];
-                                       goto loc2;
-                               }
-                               else if (nodestackpos > 0)
-                               {
-                                       ((mleaf_t *)node->children[1])->visframe = r_framecount;
-                                       node = nodestack[--nodestackpos];
-                                       goto loc2;
-                               }
-                       }
-               }
-               else if (nodestackpos > 0)
-               {
-                       node = nodestack[--nodestackpos];
-                       goto loc2;
-               }
-       }
-}
-
-static void R_PVSWorldNode()
-{
-       int portalstack, i;
-       mportal_t *p, *pstack[8192];
-       msurface_t *surf, **mark, **endmark;
-       mleaf_t *leaf;
-       qbyte *worldvis;
-
-       worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel);
-
-       leaf = r_viewleaf;
-       leaf->worldnodeframe = r_framecount;
-       portalstack = 0;
-loc0:
-       c_leafs++;
-
-       leaf->visframe = r_framecount;
-
-       if (leaf->nummarksurfaces)
-       {
-               mark = leaf->firstmarksurface;
-               endmark = mark + leaf->nummarksurfaces;
-               do
-               {
-                       surf = *mark++;
-                       // make sure surfaces are only processed once
-                       if (surf->worldnodeframe == r_framecount)
-                               continue;
-                       surf->worldnodeframe = r_framecount;
-                       if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
-                       {
-                               if (surf->flags & SURF_PLANEBACK)
-                                       surf->visframe = r_framecount;
-                       }
-                       else
-                       {
-                               if (!(surf->flags & SURF_PLANEBACK))
-                                       surf->visframe = r_framecount;
-                       }
-               }
-               while (mark < endmark);
-       }
-
-       // follow portals into other leafs
-       for (p = leaf->portals;p;p = p->next)
-       {
-               if (DotProduct(r_origin, p->plane.normal) < p->plane.dist)
-               {
-                       leaf = p->past;
-                       if (leaf->worldnodeframe != r_framecount)
-                       {
-                               leaf->worldnodeframe = r_framecount;
-                               if (leaf->contents != CONTENTS_SOLID)
-                               {
-                                       i = (leaf - cl.worldmodel->leafs) - 1;
-                                       if (worldvis[i>>3] & (1<<(i&7)))
-                                       {
-                                               if (R_NotCulledBox(leaf->mins, leaf->maxs))
-                                               {
-                                                       pstack[portalstack++] = p;
-                                                       goto loc0;
-
-loc1:
-                                                       p = pstack[--portalstack];
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
-       if (portalstack)
-               goto loc1;
-}
-
 Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex}, NULL};
 Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, NULL};
 Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, NULL};
@@ -1761,12 +1504,17 @@ Cshader_t *Cshaders[5] =
        &Cshader_sky
 };
 
-void R_PrepareSurfaces(entity_render_t *ent)
+void R_DrawSurfaces(entity_render_t *ent, int sky, int normal)
 {
        int i, alttextures, texframe, framecount;
        texture_t *t;
        model_t *model;
        msurface_t *surf;
+       vec3_t modelorg;
+       Cshader_t *shader;
+
+       if (!ent->model)
+               return;
 
        for (i = 0;i < Cshader_count;i++)
                Cshaders[i]->chain = NULL;
@@ -1775,47 +1523,97 @@ void R_PrepareSurfaces(entity_render_t *ent)
        alttextures = ent->frame != 0;
        texframe = (int)(cl.time * 5.0f);
 
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
        for (i = 0;i < model->nummodelsurfaces;i++)
        {
                surf = model->modelsortedsurfaces[i];
                if (surf->visframe == r_framecount)
                {
-                       if (surf->insertframe != r_framecount)
+                       // mark any backface surfaces as not visible
+                       if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
+                       {
+                               if (!(surf->flags & SURF_PLANEBACK))
+                                       surf->visframe = -1;
+                       }
+                       else
+                       {
+                               if (surf->flags & SURF_PLANEBACK)
+                                       surf->visframe = -1;
+                       }
+                       if (surf->visframe == r_framecount)
                        {
-                               surf->insertframe = r_framecount;
-                               c_faces++;
-                               t = surf->texinfo->texture;
-                               if (t->animated)
+                               if (r_cullsurface.integer && R_CullBox (surf->poly_mins, surf->poly_maxs))
+                                       surf->visframe = -1;
+                               else
                                {
-                                       framecount = t->anim_total[alttextures];
-                                       if (framecount >= 2)
-                                               surf->currenttexture = t->anim_frames[alttextures][texframe % framecount];
+                                       c_faces++;
+                                       t = surf->texinfo->texture;
+                                       if (t->animated)
+                                       {
+                                               framecount = t->anim_total[alttextures];
+                                               if (framecount >= 2)
+                                                       surf->currenttexture = t->anim_frames[alttextures][texframe % framecount];
+                                               else
+                                                       surf->currenttexture = t->anim_frames[alttextures][0];
+                                       }
                                        else
-                                               surf->currenttexture = t->anim_frames[alttextures][0];
+                                               surf->currenttexture = t;
+                                       surf->chain = surf->shader->chain;
+                                       surf->shader->chain = surf;
                                }
-                               else
-                                       surf->currenttexture = t;
                        }
-
-                       surf->chain = surf->shader->chain;
-                       surf->shader->chain = surf;
                }
        }
-}
 
-void R_DrawSurfaces (entity_render_t *ent, int type)
-{
-       int                     i;
-       Cshader_t       *shader;
+       if (sky)
+       {
+               for (i = 0;i < Cshader_count;i++)
+               {
+                       shader = Cshaders[i];
+                       if (shader->chain && shader->shaderfunc[SHADERSTAGE_SKY])
+                               shader->shaderfunc[SHADERSTAGE_SKY](ent, shader->chain);
+               }
+       }
 
-       for (i = 0;i < Cshader_count;i++)
+       if (normal)
        {
-               shader = Cshaders[i];
-               if (shader->chain && shader->shaderfunc[type])
-                       shader->shaderfunc[type](ent, shader->chain);
+               if (r_dynamic.integer)
+                       R_MarkLights(ent);
+
+               if (!r_vertexsurfaces.integer)
+               {
+                       for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++)
+                       {
+                               if (surf->visframe == r_framecount && surf->lightmaptexture != NULL)
+                               {
+                                       if (surf->cached_dlight
+                                       || surf->cached_ambient != r_ambient.value
+                                       || surf->cached_lightscalebit != lightscalebit)
+                                               R_BuildLightMap(ent, surf, false); // base lighting changed
+                                       else if (r_dynamic.integer)
+                                       {
+                                               if  (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0]
+                                               || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
+                                               || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
+                                               || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
+                                                       R_BuildLightMap(ent, surf, false); // base lighting changed
+                                               else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+                                                       R_BuildLightMap(ent, surf, true); // only dlights
+                                       }
+                               }
+                       }
+               }
+
+               for (i = 0;i < Cshader_count;i++)
+               {
+                       shader = Cshaders[i];
+                       if (shader->chain && shader->shaderfunc[SHADERSTAGE_NORMAL])
+                               shader->shaderfunc[SHADERSTAGE_NORMAL](ent, shader->chain);
+               }
        }
 }
 
+/*
 static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
 {
        int i;
@@ -1855,7 +1653,7 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
        }
 }
 
-void R_DrawPortals(entity_render_t *ent)
+static void R_DrawPortals(entity_render_t *ent)
 {
        int i;
        mportal_t *portal, *endportal;
@@ -1878,78 +1676,193 @@ void R_DrawPortals(entity_render_t *ent)
                }
        }
 }
+*/
 
-void R_SetupForBModelRendering(entity_render_t *ent)
+void R_DrawBrushModel(entity_render_t *ent, int sky, int normal)
 {
-       int                     i;
-       msurface_t      *surf;
-       model_t         *model;
-       vec3_t          modelorg;
+       int i;
+       msurface_t *surf;
+       model_t *model;
+       vec3_t modelorg;
 
        // because bmodels can be reused, we have to decide which things to render
        // from scratch every time
-
        model = ent->model;
-
        Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
        for (i = 0;i < model->nummodelsurfaces;i++)
        {
-               surf = model->modelsortedsurfaces[i];
-               if (((surf->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, surf->plane) >= 0))
-                       surf->visframe = r_framecount;
-               else
-                       surf->visframe = -1;
+               surf = model->surfaces + model->firstmodelsurface + i;
+               surf->visframe = r_framecount;
+               surf->pvsframe = -1;
                surf->worldnodeframe = -1;
                surf->lightframe = -1;
                surf->dlightframe = -1;
-               surf->insertframe = -1;
        }
+       R_DrawSurfaces(ent, sky, normal);
 }
 
-void R_SetupForWorldRendering(entity_render_t *ent)
+void R_SurfaceWorldNode (void)
 {
-       // there is only one instance of the world, but it can be rendered in
-       // multiple stages
+       msurface_t *surf;
+       for (surf = r_pvsfirstsurface;surf;surf = surf->pvschain)
+               surf->visframe = r_framecount;
 }
 
-static void R_SurfMarkLights (entity_render_t *ent)
+/*
+static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 {
-       int                     i;
-       msurface_t      *surf;
-
-       if (r_dynamic.integer)
-               R_MarkLights(ent);
-
-       if (!r_vertexsurfaces.integer)
+       int portalstack, i;
+       mportal_t *p, *pstack[8192];
+       msurface_t *surf, **mark, **endmark;
+       mleaf_t *leaf;
+       // LordHavoc: portal-passage worldnode with PVS;
+       // follows portals leading outward from viewleaf, does not venture
+       // offscreen or into leafs that are not visible, faster than Quake's
+       // RecursiveWorldNode
+       leaf = viewleaf;
+       leaf->worldnodeframe = r_framecount;
+       portalstack = 0;
+loc0:
+       c_leafs++;
+       if (leaf->nummarksurfaces)
        {
-               for (i = 0;i < ent->model->nummodelsurfaces;i++)
+               for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
                {
-                       surf = ent->model->modelsortedsurfaces[i];
-                       if (surf->visframe == r_framecount && surf->lightmaptexture != NULL)
+                       surf = *mark++;
+                       // make sure surfaces are only processed once
+                       if (surf->worldnodeframe != r_framecount)
                        {
-                               if (surf->cached_dlight
-                                || surf->cached_ambient != r_ambient.value
-                                || surf->cached_lightscalebit != lightscalebit)
-                                       R_BuildLightMap(ent, surf, false); // base lighting changed
-                               else if (r_dynamic.integer)
+                               surf->worldnodeframe = r_framecount;
+                               if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
                                {
-                                       if  (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0]
-                                        || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
-                                        || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
-                                        || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
-                                               R_BuildLightMap(ent, surf, false); // base lighting changed
-                                       else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
-                                               R_BuildLightMap(ent, surf, true); // only dlights
+                                       if (surf->flags & SURF_PLANEBACK)
+                                               surf->visframe = r_framecount;
                                }
+                               else
+                               {
+                                       if (!(surf->flags & SURF_PLANEBACK))
+                                               surf->visframe = r_framecount;
+                               }
+                       }
+               }
+       }
+       // follow portals into other leafs
+       for (p = leaf->portals;p;p = p->next)
+       {
+               leaf = p->past;
+               if (leaf->worldnodeframe != r_framecount)
+               {
+                       leaf->worldnodeframe = r_framecount;
+                       // FIXME: R_NotCulledBox is absolute, should be done relative
+                       if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs))
+                       {
+                               p->visframe = r_framecount;
+                               pstack[portalstack++] = p;
+                               goto loc0;
+loc1:
+                               p = pstack[--portalstack];
+                       }
+               }
+       }
+       if (portalstack)
+               goto loc1;
+}
+*/
+
+static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
+{
+       int c, leafstackpos;
+       mleaf_t *leaf, *leafstack[8192];
+       mportal_t *p;
+       msurface_t **mark;
+       vec3_t modelorg;
+       // 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
+       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       viewleaf->worldnodeframe = r_framecount;
+       leafstack[0] = viewleaf;
+       leafstackpos = 1;
+       while (leafstackpos)
+       {
+               c_leafs++;
+               leaf = leafstack[--leafstackpos];
+               // only useful for drawing portals
+               //leaf->visframe = r_framecount;
+               // draw any surfaces bounding this leaf
+               if (leaf->nummarksurfaces)
+                       for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
+                               (*mark++)->visframe = r_framecount;
+               // follow portals into other leafs
+               for (p = leaf->portals;p;p = p->next)
+               {
+                       leaf = p->past;
+                       if (leaf->worldnodeframe != r_framecount)
+                       {
+                               leaf->worldnodeframe = r_framecount;
+                               // FIXME: R_NotCulledBox is absolute, should be done relative
+                               if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs))
+                                       leafstack[leafstackpos++] = leaf;
                        }
                }
        }
+       //if (r_drawportals.integer)
+       //      R_DrawPortals(ent);
 }
 
-void R_MarkWorldLights(entity_render_t *ent)
+
+void R_PVSUpdate (mleaf_t *viewleaf)
 {
-       R_SetupForWorldRendering(ent);
-       R_SurfMarkLights(ent);
+       int i, j, l, c, bits;
+       mleaf_t *leaf;
+       qbyte *vis;
+       msurface_t **mark, *surf;
+
+       if (r_pvsviewleaf == viewleaf && r_pvsviewleafnovis == r_novis.integer)
+               return;
+
+       r_pvsframecount++;
+       r_pvsviewleaf = viewleaf;
+       r_pvsviewleafnovis = r_novis.integer;
+
+       if (viewleaf)
+       {
+               vis = Mod_LeafPVS (viewleaf, cl.worldmodel);
+               for (j = 0;j < cl.worldmodel->numleafs;j += 8)
+               {
+                       bits = *vis++;
+                       if (bits)
+                       {
+                               l = cl.worldmodel->numleafs - j;
+                               if (l > 8)
+                                       l = 8;
+                               for (i = 0;i < l;i++)
+                               {
+                                       if (bits & (1 << i))
+                                       {
+                                               leaf = &cl.worldmodel->leafs[j + i + 1];
+                                               leaf->pvsframe = r_pvsframecount;
+                                               // mark surfaces bounding this leaf as visible
+                                               for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
+                                                       (*mark++)->pvsframe = r_pvsframecount;
+                                       }
+                               }
+                       }
+               }
+               // build pvs surfacechain
+               r_pvsfirstsurface = NULL;
+               mark = &r_pvsfirstsurface;
+               for (c = cl.worldmodel->nummodelsurfaces, surf = cl.worldmodel->surfaces + cl.worldmodel->firstmodelsurface;c;c--, surf++)
+               {
+                       if (surf->pvsframe == r_pvsframecount)
+                       {
+                               *mark = surf;
+                               mark = &surf->pvschain;
+                       }
+               }
+               *mark = NULL;
+       }
 }
 
 /*
@@ -1959,12 +1872,16 @@ R_DrawWorld
 */
 void R_DrawWorld (entity_render_t *ent)
 {
-       R_SetupForWorldRendering(ent);
-
-       if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL)
-               R_SolidWorldNode (ent);
+       mleaf_t *viewleaf;
+       viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel);
+       R_PVSUpdate(viewleaf);
+       if (!viewleaf)
+               return;
+       if (r_surfaceworldnode.integer || viewleaf->contents == CONTENTS_SOLID)
+               R_SurfaceWorldNode ();
        else
-               R_PVSWorldNode (ent);
+               R_PortalWorldNode (ent, viewleaf);
+       R_DrawSurfaces(ent, true, true);
 }
 
 /*
@@ -1974,28 +1891,13 @@ R_DrawBrushModel
 */
 void R_DrawBrushModelSky (entity_render_t *ent)
 {
-       R_SetupForBModelRendering(ent);
-
-       R_PrepareSurfaces(ent);
-       R_DrawSurfaces(ent, SHADERSTAGE_SKY);
+       R_DrawBrushModel(ent, true, false);
 }
 
 void R_DrawBrushModelNormal (entity_render_t *ent)
 {
        c_bmodels++;
-
-       // have to flush queue because of possible lightmap reuse
-       R_Mesh_Render();
-
-       R_SetupForBModelRendering(ent);
-
-       R_SurfMarkLights(ent);
-
-       R_PrepareSurfaces(ent);
-
-       if (!skyrendermasked)
-               R_DrawSurfaces(ent, SHADERSTAGE_SKY);
-       R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+       R_DrawBrushModel(ent, false, true);
 }
 
 static void gl_surf_start(void)
@@ -2008,6 +1910,11 @@ static void gl_surf_shutdown(void)
 
 static void gl_surf_newmap(void)
 {
+       // reset pvs visibility variables so it will update on first frame
+       r_pvsframecount = 1;
+       r_pvsviewleaf = NULL;
+       r_pvsviewleafnovis = false;
+       r_pvsfirstsurface = NULL;
 }
 
 void GL_Surf_Init(void)
@@ -2020,10 +1927,12 @@ void GL_Surf_Init(void)
        Cvar_RegisterVariable(&r_ambient);
        Cvar_RegisterVariable(&r_vertexsurfaces);
        Cvar_RegisterVariable(&r_dlightmap);
-       Cvar_RegisterVariable(&r_drawportals);
+       //Cvar_RegisterVariable(&r_drawportals);
        Cvar_RegisterVariable(&r_testvis);
        Cvar_RegisterVariable(&r_floatbuildlightmap);
        Cvar_RegisterVariable(&r_detailtextures);
+       Cvar_RegisterVariable(&r_surfaceworldnode);
+       Cvar_RegisterVariable(&r_cullsurface);
 
        R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
 }