split model->DrawShadowVolume into CompileShadowVolume and DrawShadowVolume to simpli...

moved ShadowMesh creation from R_RTLight_Compile to R_Q1BSP_CompileShadowVolume
split R_Shadow_RenderLighting into several functions for different paths to (very slightly) improve readability
fixed a bug introduced by recent specularscale optimizations (it wasn't being passed to RenderLighting)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5690 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 0312e8ad6cee127cfcedce37ac295543471db97a..b41e061efa6c0f0cf6d9ac40f47b34774435e946 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -663,6 +663,29 @@ extern float *rsurface_tvector3f;
 extern float *rsurface_normal3f;
 extern void RSurf_SetVertexPointer(const entity_render_t *ent, const texture_t *texture, const msurface_t *surface, const vec3_t modelorg);
 
+void R_Q1BSP_CompileShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist)
+{
+       model_t *model = ent->model;
+       msurface_t *surface;
+       int surfacelistindex;
+       float projectdistance = lightradius + model->radius*2 + r_shadow_projectdistance.value;
+       texture_t *texture;
+       r_shadow_compilingrtlight->static_meshchain_shadow = Mod_ShadowMesh_Begin(r_shadow_mempool, 32768, 32768, NULL, NULL, NULL, false, false, true);
+       R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
+       for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+       {
+               surface = model->data_surfaces + surfacelist[surfacelistindex];
+               texture = surface->texture;
+               if ((texture->basematerialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL)
+                       continue;
+               if (texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2))
+                       continue;
+               R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, r_shadow_compilingrtlight->cullmins, r_shadow_compilingrtlight->cullmaxs, 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 + projectdistance, numshadowmark, shadowmarklist);
+       r_shadow_compilingrtlight->static_meshchain_shadow = Mod_ShadowMesh_Finish(r_shadow_mempool, r_shadow_compilingrtlight->static_meshchain_shadow, false, false);
+}
+
 void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs)
 {
        model_t *model = ent->model;
@@ -676,36 +699,19 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin,
                return;
        if (r_drawcollisionbrushes.integer >= 2)
                return;
-       if (!r_shadow_compilingrtlight)
-               R_UpdateAllTextureInfo(ent);
+       R_UpdateAllTextureInfo(ent);
        if (model->brush.shadowmesh)
        {
                R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
-               if (r_shadow_compilingrtlight)
-               {
-                       for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
-                       {
-                               surface = model->data_surfaces + surfacelist[surfacelistindex];
-                               texture = surface->texture;
-                               if ((texture->basematerialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL)
-                                       continue;
-                               if (texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2))
-                                       continue;
-                               R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
-                       }
-               }
-               else
+               for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
                {
-                       for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
-                       {
-                               surface = model->data_surfaces + surfacelist[surfacelistindex];
-                               texture = surface->texture->currentframe;
-                               if ((texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL)
-                                       continue;
-                               if (texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2))
-                                       continue;
-                               R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs);
-                       }
+                       surface = model->data_surfaces + surfacelist[surfacelistindex];
+                       texture = surface->texture->currentframe;
+                       if ((texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL)
+                               continue;
+                       if (texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2))
+                               continue;
+                       R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->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 + projectdistance, numshadowmark, shadowmarklist);
        }
@@ -823,7 +829,7 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolorbase, int numsurfa
                        rsurface_normal3f = varray_normal3f;
                        Mod_BuildTextureVectorsAndNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, rsurface_vertex3f, surface->groupmesh->data_texcoordtexture2f, surface->groupmesh->data_element3i + surface->num_firsttriangle * 3, rsurface_svector3f, rsurface_tvector3f, rsurface_normal3f, r_smoothnormals_areaweighting.integer);
                }
-               R_Shadow_RenderLighting(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle), rsurface_vertex3f, rsurface_svector3f, rsurface_tvector3f, rsurface_normal3f, surface->groupmesh->data_texcoordtexture2f, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, texture->skin.gloss);
+               R_Shadow_RenderLighting(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle), rsurface_vertex3f, rsurface_svector3f, rsurface_tvector3f, rsurface_normal3f, surface->groupmesh->data_texcoordtexture2f, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, texture->skin.gloss, specularscale);
        }
        qglEnable(GL_CULL_FACE);
 }

diff --git a/model_alias.c b/model_alias.c
index dd41d37868d5c2d3e0d70786ec68036a9091d6d6..8215251c9a9edd1364501f4baace327148b45f87 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -434,9 +434,6 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
 
 #define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%d exceeds %d - %d)\n", loadmodel->name, VALUE, MIN, MAX);
 #define BOUNDF(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%f exceeds %f - %f)\n", loadmodel->name, VALUE, MIN, MAX);
-extern void R_Q1BSP_Draw(entity_render_t *ent);
-extern void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
-extern void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolor, int numsurfaces, const int *surfacelist);
 void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 {
        int i, j, version, totalskins, skinwidth, skinheight, groupframes, groupskins, numverts;
@@ -472,6 +469,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
+       loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
        loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
        loadmodel->DrawLight = R_Q1BSP_DrawLight;
        loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
@@ -792,6 +790,7 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
+       loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
        loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
        loadmodel->DrawLight = R_Q1BSP_DrawLight;
        loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
@@ -1031,6 +1030,7 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
+       loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
        loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
        loadmodel->DrawLight = R_Q1BSP_DrawLight;
        loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
@@ -1166,6 +1166,7 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
+       loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
        loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
        loadmodel->DrawLight = R_Q1BSP_DrawLight;
        loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
@@ -1458,6 +1459,7 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
+       loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
        loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
        loadmodel->DrawLight = R_Q1BSP_DrawLight;
        loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
@@ -1686,6 +1688,7 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
+       loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
        loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
        loadmodel->DrawLight = R_Q1BSP_DrawLight;
        loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;

diff --git a/model_brush.c b/model_brush.c
index daef2f3172988bb62e2eeb0f3a6d0ce92e7d83c4..430de3fbbc06a06e607ead60a857e8cdbd325480 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -2963,11 +2963,6 @@ static void Mod_Q1BSP_RoundUpToHullSize(model_t *cmodel, const vec3_t inmins, co
        VectorAdd(inmins, hull->clip_size, outmaxs);
 }
 
-extern void R_Q1BSP_DrawSky(entity_render_t *ent);
-extern void R_Q1BSP_Draw(entity_render_t *ent);
-extern void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, qbyte *outleafpvs, int *outnumleafspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer);
-extern void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
-extern void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolor, int numsurfaces, const int *surfacelist);
 void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend)
 {
        int i, j, k;
@@ -3160,6 +3155,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend)
                mod->DrawSky = NULL;
                mod->Draw = R_Q1BSP_Draw;
                mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+               mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
                mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
                mod->DrawLight = R_Q1BSP_DrawLight;
                if (i != 0)
@@ -5521,6 +5517,7 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend)
        mod->brush.PointInLeaf = Mod_Q1BSP_PointInLeaf;
        mod->Draw = R_Q1BSP_Draw;
        mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+       mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
        mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
        mod->DrawLight = R_Q1BSP_DrawLight;
 

diff --git a/model_shared.h b/model_shared.h
index a97c8cc89abd287fe033e5df196e10e13df32824..9e8f211865ebef76ddea380199aa0fa1a2eab98e 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -512,6 +512,8 @@ typedef struct model_s
        void(*Draw)(struct entity_render_s *ent);
        // gathers info on which clusters and surfaces are lit by light, as well as calculating a bounding box
        void(*GetLightInfo)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, qbyte *outleafpvs, int *outnumleafspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer);
+       // compile a shadow volume for the model based on light source
+       void(*CompileShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist);
        // draw a shadow volume for the model based on light source
        void(*DrawShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
        // draw the lighting on a model (through stencil)
@@ -610,6 +612,15 @@ void Mod_BrushInit(void);
 int Mod_Q1BSP_NativeContentsFromSuperContents(struct model_s *model, int supercontents);
 int Mod_Q1BSP_SuperContentsFromNativeContents(struct model_s *model, int nativecontents);
 
+// a lot of model formats use the Q1BSP code, so here are the prototypes...
+struct entity_render_s;
+void R_Q1BSP_DrawSky(struct entity_render_s *ent);
+void R_Q1BSP_Draw(struct entity_render_s *ent);
+void R_Q1BSP_GetLightInfo(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, qbyte *outleafpvs, int *outnumleafspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer);
+void R_Q1BSP_CompileShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist);
+void R_Q1BSP_DrawShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
+void R_Q1BSP_DrawLight(struct entity_render_s *ent, float *lightcolor, int numsurfaces, const int *surfacelist);
+
 // alias models
 struct frameblend_s;
 void Mod_AliasInit(void);

diff --git a/model_sprite.c b/model_sprite.c
index 6e94c8b42e1a5587d7fc33e55d6d0d1c8362c51c..a74f9bb985d10f31755d2ff4b2565b12e2ea37c7 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -216,6 +216,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
 
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Model_Sprite_Draw;
+       loadmodel->CompileShadowVolume = NULL;
        loadmodel->DrawShadowVolume = NULL;
        loadmodel->DrawLight = NULL;
 
@@ -328,6 +329,7 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
 
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Model_Sprite_Draw;
+       loadmodel->CompileShadowVolume = NULL;
        loadmodel->DrawShadowVolume = NULL;
        loadmodel->DrawLight = NULL;
 

diff --git a/r_shadow.c b/r_shadow.c
index b2408c279ff2d3c8bf39ce62defd1d71ea32d005..f6497c6932dec4b8d9d3888c1f246f036938d620 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -1595,377 +1595,533 @@ static void R_Shadow_GenTexCoords_Specular_NormalCubeMap(float *out3f, int numve
        }
 }
 
-void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture)
+void R_Shadow_RenderLighting_VisibleLighting(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture, float specularscale)
+{
+       rmeshstate_t m;
+       GL_Color(0.1, 0.025, 0, 1);
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(firstvertex, numvertices);
+       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+       GL_LockArrays(0, 0);
+}
+
+void R_Shadow_RenderLighting_Light_GLSL(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture, float specularscale)
+{
+       // GLSL shader path (GFFX5200, Radeon 9500)
+       // TODO: add direct pants/shirt rendering
+       if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
+               R_Shadow_RenderLighting_Light_GLSL(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL, 0);
+       if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
+               R_Shadow_RenderLighting_Light_GLSL(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL, 0);
+       R_Mesh_VertexPointer(vertex3f);
+       R_Mesh_TexCoordPointer(0, 2, texcoord2f);
+       R_Mesh_TexCoordPointer(1, 3, svector3f);
+       R_Mesh_TexCoordPointer(2, 3, tvector3f);
+       R_Mesh_TexCoordPointer(3, 3, normal3f);
+       R_Mesh_TexBind(0, R_GetTexture(bumptexture));
+       R_Mesh_TexBind(1, R_GetTexture(basetexture));
+       R_Mesh_TexBind(2, R_GetTexture(glosstexture));
+       if (r_shadow_lightpermutation & SHADERPERMUTATION_SPECULAR)
+       {
+               qglUniform1fARB(qglGetUniformLocationARB(r_shadow_lightprog, "SpecularScale"), specularscale);CHECKGLERROR
+       }
+       qglUniform3fARB(qglGetUniformLocationARB(r_shadow_lightprog, "LightColor"), lightcolorbase[0], lightcolorbase[1], lightcolorbase[2]);CHECKGLERROR
+       GL_LockArrays(firstvertex, numvertices);
+       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+       c_rt_lightmeshes++;
+       c_rt_lighttris += numtriangles;
+       GL_LockArrays(0, 0);
+}
+
+void R_Shadow_RenderLighting_Light_Dot3(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture, float specularscale)
 {
        int renders;
-       float color[3], color2[3], colorscale, specularscale;
+       float color2[3], colorscale;
        rmeshstate_t m;
-       // FIXME: support MATERIALFLAG_NODEPTHTEST
-       if (r_shadowstage == R_SHADOWSTAGE_VISIBLELIGHTING)
+       // TODO: add direct pants/shirt rendering
+       if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
+               R_Shadow_RenderLighting_Light_Dot3(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL, 0);
+       if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
+               R_Shadow_RenderLighting_Light_Dot3(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL, 0);
+       if (r_shadow_rtlight->ambientscale)
        {
-               int passes = 0;
-               if (r_shadow_glsl.integer && r_shadow_program_light[0])
+               GL_Color(1,1,1,1);
+               colorscale = r_shadow_rtlight->ambientscale;
+               // colorscale accounts for how much we multiply the brightness
+               // during combine.
+               //
+               // mult is how many times the final pass of the lighting will be
+               // performed to get more brightness than otherwise possible.
+               //
+               // Limit mult to 64 for sanity sake.
+               if (r_shadow_texture3d.integer && r_shadow_lightcubemap != r_texture_whitecube && r_textureunits.integer >= 4)
                {
-                       // GLSL shader path (GFFX5200, Radeon 9500)
-                       // TODO: add direct pants/shirt rendering
-                       if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
-                               R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL);
-                       if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
-                               R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL);
-                       passes++;
+                       // 3 3D combine path (Geforce3, Radeon 8500)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[0] = vertex3f;
+                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+#else
+                       m.pointer_texcoord3f[0] = varray_texcoord3f[0];
+                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+#endif
+                       m.tex[1] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[1] = texcoord2f;
+                       m.texcubemap[2] = R_GetTexture(r_shadow_lightcubemap);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[2] = vertex3f;
+                       m.texmatrix[2] = r_shadow_entitytolight;
+#else
+                       m.pointer_texcoord3f[2] = varray_texcoord3f[2];
+                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
+#endif
+                       GL_BlendFunc(GL_ONE, GL_ONE);
                }
-               else if (gl_dot3arb && gl_texturecubemap && r_textureunits.integer >= 2 && gl_combine.integer && gl_stencil)
+               else if (r_shadow_texture3d.integer && r_shadow_lightcubemap == r_texture_whitecube && r_textureunits.integer >= 2)
                {
-                       // TODO: add direct pants/shirt rendering
-                       if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
-                               R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL);
-                       if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
-                               R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL);
-                       if (r_shadow_rtlight->ambientscale)
-                       {
-                               colorscale = r_shadow_rtlight->ambientscale;
-                               if (r_shadow_texture3d.integer && r_shadow_lightcubemap != r_texture_whitecube && r_textureunits.integer >= 4)
-                               {
-                               }
-                               else if (r_shadow_texture3d.integer && r_shadow_lightcubemap == r_texture_whitecube && r_textureunits.integer >= 2)
-                               {
-                               }
-                               else if (r_textureunits.integer >= 4 && r_shadow_lightcubemap != r_texture_whitecube)
-                               {
-                               }
-                               else if (r_textureunits.integer >= 3 && r_shadow_lightcubemap == r_texture_whitecube)
-                               {
-                               }
-                               else
-                                       passes++;
-                               VectorScale(lightcolorbase, colorscale, color2);
-                               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                                       passes++;
-                       }
-                       if (r_shadow_rtlight->diffusescale)
-                       {
-                               colorscale = r_shadow_rtlight->diffusescale;
-                               if (r_shadow_texture3d.integer && r_textureunits.integer >= 4)
-                               {
-                                       // 3/2 3D combine path (Geforce3, Radeon 8500)
-                                       passes++;
-                               }
-                               else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap != r_texture_whitecube)
-                               {
-                                       // 1/2/2 3D combine path (original Radeon)
-                                       passes += 2;
-                               }
-                               else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap == r_texture_whitecube)
-                               {
-                                       // 2/2 3D combine path (original Radeon)
-                                       passes++;
-                               }
-                               else if (r_textureunits.integer >= 4)
-                               {
-                                       // 4/2 2D combine path (Geforce3, Radeon 8500)
-                                       passes++;
-                               }
-                               else
-                               {
-                                       // 2/2/2 2D combine path (any dot3 card)
-                                       passes += 2;
-                               }
-                               VectorScale(lightcolorbase, colorscale, color2);
-                               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                                       passes++;
-                       }
-                       if (specularscale && glosstexture != r_texture_black)
-                       {
-                               //if (gl_support_blendsquare)
-                               {
-                                       colorscale = specularscale;
-                                       if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap != r_texture_whitecube /* && gl_support_blendsquare*/) // FIXME: detect blendsquare!
-                                               passes += 4;
-                                       else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap == r_texture_whitecube /* && gl_support_blendsquare*/) // FIXME: detect blendsquare!
-                                               passes += 3;
-                                       else
-                                               passes += 4;
-                                       VectorScale(lightcolorbase, colorscale, color2);
-                                       for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                                               passes++;
-                               }
-                       }
+                       // 2 3D combine path (Geforce3, original Radeon)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[0] = vertex3f;
+                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+#else
+                       m.pointer_texcoord3f[0] = varray_texcoord3f[0];
+                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+#endif
+                       m.tex[1] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[1] = texcoord2f;
+                       GL_BlendFunc(GL_ONE, GL_ONE);
                }
-               else
+               else if (r_textureunits.integer >= 4 && r_shadow_lightcubemap != r_texture_whitecube)
                {
-                       // TODO: add direct pants/shirt rendering
-                       if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
-                               R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL);
-                       if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
-                               R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL);
-                       if (r_shadow_rtlight->ambientscale)
-                       {
-                               VectorScale(lightcolorbase, r_shadow_rtlight->ambientscale, color2);
-                               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                                       passes++;
-                       }
-                       if (r_shadow_rtlight->diffusescale)
+                       // 4 2D combine path (Geforce3, Radeon 8500)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[0] = vertex3f;
+                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+#else
+                       m.pointer_texcoord[0] = varray_texcoord2f[0];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+#endif
+                       m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[1] = vertex3f;
+                       m.texmatrix[1] = r_shadow_entitytoattenuationz;
+#else
+                       m.pointer_texcoord[1] = varray_texcoord2f[1];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+#endif
+                       m.tex[2] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[2] = texcoord2f;
+                       if (r_shadow_lightcubemap != r_texture_whitecube)
                        {
-                               VectorScale(lightcolorbase, r_shadow_rtlight->diffusescale, color2);
-                               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                                       passes++;
+                               m.texcubemap[3] = R_GetTexture(r_shadow_lightcubemap);
+#ifdef USETEXMATRIX
+                               m.pointer_texcoord3f[3] = vertex3f;
+                               m.texmatrix[3] = r_shadow_entitytolight;
+#else
+                               m.pointer_texcoord3f[3] = varray_texcoord3f[3];
+                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[3] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
+#endif
                        }
+                       GL_BlendFunc(GL_ONE, GL_ONE);
                }
-               if (passes)
+               else if (r_textureunits.integer >= 3 && r_shadow_lightcubemap == r_texture_whitecube)
                {
-                       GL_Color(0.1*passes, 0.025*passes, 0, 1);
+                       // 3 2D combine path (Geforce3, original Radeon)
                        memset(&m, 0, sizeof(m));
                        m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[0] = vertex3f;
+                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+#else
+                       m.pointer_texcoord[0] = varray_texcoord2f[0];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+#endif
+                       m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[1] = vertex3f;
+                       m.texmatrix[1] = r_shadow_entitytoattenuationz;
+#else
+                       m.pointer_texcoord[1] = varray_texcoord2f[1];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+#endif
+                       m.tex[2] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[2] = texcoord2f;
+                       GL_BlendFunc(GL_ONE, GL_ONE);
+               }
+               else
+               {
+                       // 2/2/2 2D combine path (any dot3 card)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[0] = vertex3f;
+                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+#else
+                       m.pointer_texcoord[0] = varray_texcoord2f[0];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+#endif
+                       m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+#ifdef USETEXMATRIX
+                       m.pointer_texcoord3f[1] = vertex3f;
+                       m.texmatrix[1] = r_shadow_entitytoattenuationz;
+#else
+                       m.pointer_texcoord[1] = varray_texcoord2f[1];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+#endif
                        R_Mesh_State(&m);
+                       GL_ColorMask(0,0,0,1);
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
                        GL_LockArrays(firstvertex, numvertices);
                        R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
                        GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[0] = texcoord2f;
+                       if (r_shadow_lightcubemap != r_texture_whitecube)
+                       {
+                               m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
+#ifdef USETEXMATRIX
+                               m.pointer_texcoord3f[1] = vertex3f;
+                               m.texmatrix[1] = r_shadow_entitytolight;
+#else
+                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
+#endif
+                       }
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
                }
-               return;
-       }
-       else if (r_shadowstage == R_SHADOWSTAGE_LIGHT_GLSL)
-       {
-               // GLSL shader path (GFFX5200, Radeon 9500)
-               // TODO: add direct pants/shirt rendering
-               if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
-                       R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL);
-               if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
-                       R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL);
-               R_Mesh_VertexPointer(vertex3f);
-               R_Mesh_TexCoordPointer(0, 2, texcoord2f);
-               R_Mesh_TexCoordPointer(1, 3, svector3f);
-               R_Mesh_TexCoordPointer(2, 3, tvector3f);
-               R_Mesh_TexCoordPointer(3, 3, normal3f);
-               R_Mesh_TexBind(0, R_GetTexture(bumptexture));
-               R_Mesh_TexBind(1, R_GetTexture(basetexture));
-               R_Mesh_TexBind(2, R_GetTexture(glosstexture));
-               if (r_shadow_lightpermutation & SHADERPERMUTATION_SPECULAR)
+               // this final code is shared
+               R_Mesh_State(&m);
+               GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0);
+               VectorScale(lightcolorbase, colorscale, color2);
+               GL_LockArrays(firstvertex, numvertices);
+               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
                {
-                       qglUniform1fARB(qglGetUniformLocationARB(r_shadow_lightprog, "SpecularScale"), specularscale);CHECKGLERROR
+                       GL_Color(bound(0, color2[0], 1), bound(0, color2[1], 1), bound(0, color2[2], 1), 1);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
                }
-               qglUniform3fARB(qglGetUniformLocationARB(r_shadow_lightprog, "LightColor"), lightcolorbase[0], lightcolorbase[1], lightcolorbase[2]);CHECKGLERROR
-               GL_LockArrays(firstvertex, numvertices);
-               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-               c_rt_lightmeshes++;
-               c_rt_lighttris += numtriangles;
                GL_LockArrays(0, 0);
        }
-       else if (r_shadowstage == R_SHADOWSTAGE_LIGHT_DOT3)
+       if (r_shadow_rtlight->diffusescale)
        {
-               // TODO: add direct pants/shirt rendering
-               if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
-                       R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL);
-               if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
-                       R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL);
-               if (r_shadow_rtlight->ambientscale)
+               GL_Color(1,1,1,1);
+               colorscale = r_shadow_rtlight->diffusescale;
+               // colorscale accounts for how much we multiply the brightness
+               // during combine.
+               //
+               // mult is how many times the final pass of the lighting will be
+               // performed to get more brightness than otherwise possible.
+               //
+               // Limit mult to 64 for sanity sake.
+               if (r_shadow_texture3d.integer && r_textureunits.integer >= 4)
                {
-                       GL_Color(1,1,1,1);
-                       colorscale = r_shadow_rtlight->ambientscale;
-                       // colorscale accounts for how much we multiply the brightness
-                       // during combine.
-                       //
-                       // mult is how many times the final pass of the lighting will be
-                       // performed to get more brightness than otherwise possible.
-                       //
-                       // Limit mult to 64 for sanity sake.
-                       if (r_shadow_texture3d.integer && r_shadow_lightcubemap != r_texture_whitecube && r_textureunits.integer >= 4)
-                       {
-                               // 3 3D combine path (Geforce3, Radeon 8500)
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture);
+                       // 3/2 3D combine path (Geforce3, Radeon 8500)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(bumptexture);
+                       m.texcombinergb[0] = GL_REPLACE;
+                       m.pointer_texcoord[0] = texcoord2f;
+                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
+                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
+                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                       R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
+                       m.tex3d[2] = R_GetTexture(r_shadow_attenuation3dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[0] = vertex3f;
-                               m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+                       m.pointer_texcoord3f[2] = vertex3f;
+                       m.texmatrix[2] = r_shadow_entitytoattenuationxyz;
 #else
-                               m.pointer_texcoord3f[0] = varray_texcoord3f[0];
-                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+                       m.pointer_texcoord3f[2] = varray_texcoord3f[2];
+                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               m.tex[1] = R_GetTexture(basetexture);
-                               m.pointer_texcoord[1] = texcoord2f;
-                               m.texcubemap[2] = R_GetTexture(r_shadow_lightcubemap);
+                       R_Mesh_State(&m);
+                       GL_ColorMask(0,0,0,1);
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[0] = texcoord2f;
+                       if (r_shadow_lightcubemap != r_texture_whitecube)
+                       {
+                               m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[2] = vertex3f;
-                               m.texmatrix[2] = r_shadow_entitytolight;
+                               m.pointer_texcoord3f[1] = vertex3f;
+                               m.texmatrix[1] = r_shadow_entitytolight;
 #else
-                               m.pointer_texcoord3f[2] = varray_texcoord3f[2];
-                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
+                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
 #endif
-                               GL_BlendFunc(GL_ONE, GL_ONE);
                        }
-                       else if (r_shadow_texture3d.integer && r_shadow_lightcubemap == r_texture_whitecube && r_textureunits.integer >= 2)
-                       {
-                               // 2 3D combine path (Geforce3, original Radeon)
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture);
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
+               }
+               else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap != r_texture_whitecube)
+               {
+                       // 1/2/2 3D combine path (original Radeon)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[0] = vertex3f;
-                               m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+                       m.pointer_texcoord3f[0] = vertex3f;
+                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
 #else
-                               m.pointer_texcoord3f[0] = varray_texcoord3f[0];
-                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+                       m.pointer_texcoord3f[0] = varray_texcoord3f[0];
+                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               m.tex[1] = R_GetTexture(basetexture);
-                               m.pointer_texcoord[1] = texcoord2f;
-                               GL_BlendFunc(GL_ONE, GL_ONE);
-                       }
-                       else if (r_textureunits.integer >= 4 && r_shadow_lightcubemap != r_texture_whitecube)
+                       R_Mesh_State(&m);
+                       GL_ColorMask(0,0,0,1);
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(bumptexture);
+                       m.texcombinergb[0] = GL_REPLACE;
+                       m.pointer_texcoord[0] = texcoord2f;
+                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
+                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
+                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                       R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
+                       R_Mesh_State(&m);
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ZERO);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[0] = texcoord2f;
+                       if (r_shadow_lightcubemap != r_texture_whitecube)
                        {
-                               // 4 2D combine path (Geforce3, Radeon 8500)
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
+                               m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[0] = vertex3f;
-                               m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+                               m.pointer_texcoord3f[1] = vertex3f;
+                               m.texmatrix[1] = r_shadow_entitytolight;
 #else
-                               m.pointer_texcoord[0] = varray_texcoord2f[0];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
 #endif
-                               m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       }
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
+               }
+               else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap == r_texture_whitecube)
+               {
+                       // 2/2 3D combine path (original Radeon)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(bumptexture);
+                       m.texcombinergb[0] = GL_REPLACE;
+                       m.pointer_texcoord[0] = texcoord2f;
+                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
+                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
+                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                       R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
+                       R_Mesh_State(&m);
+                       GL_ColorMask(0,0,0,1);
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[0] = texcoord2f;
+                       m.tex3d[1] = R_GetTexture(r_shadow_attenuation3dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[1] = vertex3f;
-                               m.texmatrix[1] = r_shadow_entitytoattenuationz;
+                       m.pointer_texcoord3f[1] = vertex3f;
+                       m.texmatrix[1] = r_shadow_entitytoattenuationxyz;
 #else
-                               m.pointer_texcoord[1] = varray_texcoord2f[1];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               m.tex[2] = R_GetTexture(basetexture);
-                               m.pointer_texcoord[2] = texcoord2f;
-                               if (r_shadow_lightcubemap != r_texture_whitecube)
-                               {
-                                       m.texcubemap[3] = R_GetTexture(r_shadow_lightcubemap);
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
+               }
+               else if (r_textureunits.integer >= 4)
+               {
+                       // 4/2 2D combine path (Geforce3, Radeon 8500)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(bumptexture);
+                       m.texcombinergb[0] = GL_REPLACE;
+                       m.pointer_texcoord[0] = texcoord2f;
+                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
+                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
+                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                       R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
+                       m.tex[2] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[3] = vertex3f;
-                                       m.texmatrix[3] = r_shadow_entitytolight;
+                       m.pointer_texcoord3f[2] = vertex3f;
+                       m.texmatrix[2] = r_shadow_entitytoattenuationxyz;
 #else
-                                       m.pointer_texcoord3f[3] = varray_texcoord3f[3];
-                                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[3] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
+                       m.pointer_texcoord[2] = varray_texcoord2f[2];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               }
-                               GL_BlendFunc(GL_ONE, GL_ONE);
-                       }
-                       else if (r_textureunits.integer >= 3 && r_shadow_lightcubemap == r_texture_whitecube)
-                       {
-                               // 3 2D combine path (Geforce3, original Radeon)
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       m.tex[3] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[0] = vertex3f;
-                               m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+                       m.pointer_texcoord3f[3] = vertex3f;
+                       m.texmatrix[3] = r_shadow_entitytoattenuationz;
 #else
-                               m.pointer_texcoord[0] = varray_texcoord2f[0];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+                       m.pointer_texcoord[3] = varray_texcoord2f[3];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[3] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
 #endif
-                               m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       R_Mesh_State(&m);
+                       GL_ColorMask(0,0,0,1);
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[0] = texcoord2f;
+                       if (r_shadow_lightcubemap != r_texture_whitecube)
+                       {
+                               m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
 #ifdef USETEXMATRIX
                                m.pointer_texcoord3f[1] = vertex3f;
-                               m.texmatrix[1] = r_shadow_entitytoattenuationz;
+                               m.texmatrix[1] = r_shadow_entitytolight;
 #else
-                               m.pointer_texcoord[1] = varray_texcoord2f[1];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
 #endif
-                               m.tex[2] = R_GetTexture(basetexture);
-                               m.pointer_texcoord[2] = texcoord2f;
-                               GL_BlendFunc(GL_ONE, GL_ONE);
                        }
-                       else
-                       {
-                               // 2/2/2 2D combine path (any dot3 card)
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
+               }
+               else
+               {
+                       // 2/2/2 2D combine path (any dot3 card)
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[0] = vertex3f;
-                               m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
+                       m.pointer_texcoord3f[0] = vertex3f;
+                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
 #else
-                               m.pointer_texcoord[0] = varray_texcoord2f[0];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+                       m.pointer_texcoord[0] = varray_texcoord2f[0];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[1] = vertex3f;
-                               m.texmatrix[1] = r_shadow_entitytoattenuationz;
+                       m.pointer_texcoord3f[1] = vertex3f;
+                       m.texmatrix[1] = r_shadow_entitytoattenuationz;
 #else
-                               m.pointer_texcoord[1] = varray_texcoord2f[1];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+                       m.pointer_texcoord[1] = varray_texcoord2f[1];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
 #endif
-                               R_Mesh_State(&m);
-                               GL_ColorMask(0,0,0,1);
-                               GL_BlendFunc(GL_ONE, GL_ZERO);
-                               GL_LockArrays(firstvertex, numvertices);
-                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                               GL_LockArrays(0, 0);
-                               c_rt_lightmeshes++;
-                               c_rt_lighttris += numtriangles;
+                       R_Mesh_State(&m);
+                       GL_ColorMask(0,0,0,1);
+                       GL_BlendFunc(GL_ONE, GL_ZERO);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
 
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(basetexture);
-                               m.pointer_texcoord[0] = texcoord2f;
-                               if (r_shadow_lightcubemap != r_texture_whitecube)
-                               {
-                                       m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
-#ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[1] = vertex3f;
-                                       m.texmatrix[1] = r_shadow_entitytolight;
-#else
-                                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
-#endif
-                               }
-                               GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
-                       }
-                       // this final code is shared
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(bumptexture);
+                       m.texcombinergb[0] = GL_REPLACE;
+                       m.pointer_texcoord[0] = texcoord2f;
+                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
+                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
+                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                       R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
                        R_Mesh_State(&m);
-                       GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0);
-                       VectorScale(lightcolorbase, colorscale, color2);
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ZERO);
                        GL_LockArrays(firstvertex, numvertices);
-                       for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+
+                       memset(&m, 0, sizeof(m));
+                       m.pointer_vertex = vertex3f;
+                       m.tex[0] = R_GetTexture(basetexture);
+                       m.pointer_texcoord[0] = texcoord2f;
+                       if (r_shadow_lightcubemap != r_texture_whitecube)
                        {
-                               GL_Color(bound(0, color2[0], 1), bound(0, color2[1], 1), bound(0, color2[2], 1), 1);
-                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                               c_rt_lightmeshes++;
-                               c_rt_lighttris += numtriangles;
+                               m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
+#ifdef USETEXMATRIX
+                               m.pointer_texcoord3f[1] = vertex3f;
+                               m.texmatrix[1] = r_shadow_entitytolight;
+#else
+                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
+                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
+#endif
                        }
-                       GL_LockArrays(0, 0);
+                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
+               }
+               // this final code is shared
+               R_Mesh_State(&m);
+               GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0);
+               VectorScale(lightcolorbase, colorscale, color2);
+               GL_LockArrays(firstvertex, numvertices);
+               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
+               {
+                       GL_Color(bound(0, color2[0], 1), bound(0, color2[1], 1), bound(0, color2[2], 1), 1);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
                }
-               if (r_shadow_rtlight->diffusescale)
+               GL_LockArrays(0, 0);
+       }
+       if (specularscale && glosstexture != r_texture_black)
+       {
+               // FIXME: detect blendsquare!
+               //if (gl_support_blendsquare)
                {
+                       colorscale = specularscale;
                        GL_Color(1,1,1,1);
-                       colorscale = r_shadow_rtlight->diffusescale;
-                       // colorscale accounts for how much we multiply the brightness
-                       // during combine.
-                       //
-                       // mult is how many times the final pass of the lighting will be
-                       // performed to get more brightness than otherwise possible.
-                       //
-                       // Limit mult to 64 for sanity sake.
-                       if (r_shadow_texture3d.integer && r_textureunits.integer >= 4)
+                       if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap != r_texture_whitecube /* && gl_support_blendsquare*/) // FIXME: detect blendsquare!
                        {
-                               // 3/2 3D combine path (Geforce3, Radeon 8500)
+                               // 2/0/0/1/2 3D combine blendsquare path
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
                                m.tex[0] = R_GetTexture(bumptexture);
-                               m.texcombinergb[0] = GL_REPLACE;
                                m.pointer_texcoord[0] = texcoord2f;
                                m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
                                m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
                                m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                               R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
-                               m.tex3d[2] = R_GetTexture(r_shadow_attenuation3dtexture);
-#ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[2] = vertex3f;
-                               m.texmatrix[2] = r_shadow_entitytoattenuationxyz;
-#else
-                               m.pointer_texcoord3f[2] = varray_texcoord3f[2];
-                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
-#endif
+                               R_Shadow_GenTexCoords_Specular_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin);
                                R_Mesh_State(&m);
                                GL_ColorMask(0,0,0,1);
-                               GL_BlendFunc(GL_ONE, GL_ZERO);
+                               // this squares the result
+                               GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
                                GL_LockArrays(firstvertex, numvertices);
                                R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
                                GL_LockArrays(0, 0);
@@ -1974,24 +2130,22 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
 
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(basetexture);
-                               m.pointer_texcoord[0] = texcoord2f;
-                               if (r_shadow_lightcubemap != r_texture_whitecube)
-                               {
-                                       m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
-#ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[1] = vertex3f;
-                                       m.texmatrix[1] = r_shadow_entitytolight;
-#else
-                                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
-#endif
-                               }
-                               GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
-                       }
-                       else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap != r_texture_whitecube)
-                       {
-                               // 1/2/2 3D combine path (original Radeon)
+                               R_Mesh_State(&m);
+                               GL_LockArrays(firstvertex, numvertices);
+                               // square alpha in framebuffer a few times to make it shiny
+                               GL_BlendFunc(GL_ZERO, GL_DST_ALPHA);
+                               // these comments are a test run through this math for intensity 0.5
+                               // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier)
+                               // 0.25 * 0.25 = 0.0625 (this is another pass)
+                               // 0.0625 * 0.0625 = 0.00390625 (this is another pass)
+                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                               c_rt_lightmeshes++;
+                               c_rt_lighttris += numtriangles;
+                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                               c_rt_lightmeshes++;
+                               c_rt_lighttris += numtriangles;
+                               GL_LockArrays(0, 0);
+
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
                                m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture);
@@ -2002,24 +2156,6 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
                                m.pointer_texcoord3f[0] = varray_texcoord3f[0];
                                R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               R_Mesh_State(&m);
-                               GL_ColorMask(0,0,0,1);
-                               GL_BlendFunc(GL_ONE, GL_ZERO);
-                               GL_LockArrays(firstvertex, numvertices);
-                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                               GL_LockArrays(0, 0);
-                               c_rt_lightmeshes++;
-                               c_rt_lighttris += numtriangles;
-
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(bumptexture);
-                               m.texcombinergb[0] = GL_REPLACE;
-                               m.pointer_texcoord[0] = texcoord2f;
-                               m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
-                               m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
-                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                               R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
                                R_Mesh_State(&m);
                                GL_BlendFunc(GL_DST_ALPHA, GL_ZERO);
                                GL_LockArrays(firstvertex, numvertices);
@@ -2030,7 +2166,7 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
 
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(basetexture);
+                               m.tex[0] = R_GetTexture(glosstexture);
                                m.pointer_texcoord[0] = texcoord2f;
                                if (r_shadow_lightcubemap != r_texture_whitecube)
                                {
@@ -2045,21 +2181,21 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
                                }
                                GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
                        }
-                       else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap == r_texture_whitecube)
+                       else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap == r_texture_whitecube /* && gl_support_blendsquare*/) // FIXME: detect blendsquare!
                        {
-                               // 2/2 3D combine path (original Radeon)
+                               // 2/0/0/2 3D combine blendsquare path
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
                                m.tex[0] = R_GetTexture(bumptexture);
-                               m.texcombinergb[0] = GL_REPLACE;
                                m.pointer_texcoord[0] = texcoord2f;
                                m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
                                m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
                                m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                               R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
+                               R_Shadow_GenTexCoords_Specular_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin);
                                R_Mesh_State(&m);
                                GL_ColorMask(0,0,0,1);
-                               GL_BlendFunc(GL_ONE, GL_ZERO);
+                               // this squares the result
+                               GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
                                GL_LockArrays(firstvertex, numvertices);
                                R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
                                GL_LockArrays(0, 0);
@@ -2068,7 +2204,25 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
 
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(basetexture);
+                               R_Mesh_State(&m);
+                               GL_LockArrays(firstvertex, numvertices);
+                               // square alpha in framebuffer a few times to make it shiny
+                               GL_BlendFunc(GL_ZERO, GL_DST_ALPHA);
+                               // these comments are a test run through this math for intensity 0.5
+                               // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier)
+                               // 0.25 * 0.25 = 0.0625 (this is another pass)
+                               // 0.0625 * 0.0625 = 0.00390625 (this is another pass)
+                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                               c_rt_lightmeshes++;
+                               c_rt_lighttris += numtriangles;
+                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                               c_rt_lightmeshes++;
+                               c_rt_lighttris += numtriangles;
+                               GL_LockArrays(0, 0);
+
+                               memset(&m, 0, sizeof(m));
+                               m.pointer_vertex = vertex3f;
+                               m.tex[0] = R_GetTexture(glosstexture);
                                m.pointer_texcoord[0] = texcoord2f;
                                m.tex3d[1] = R_GetTexture(r_shadow_attenuation3dtexture);
 #ifdef USETEXMATRIX
@@ -2080,37 +2234,21 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
 #endif
                                GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
                        }
-                       else if (r_textureunits.integer >= 4)
+                       else
                        {
-                               // 4/2 2D combine path (Geforce3, Radeon 8500)
+                               // 2/0/0/2/2 2D combine blendsquare path
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
                                m.tex[0] = R_GetTexture(bumptexture);
-                               m.texcombinergb[0] = GL_REPLACE;
                                m.pointer_texcoord[0] = texcoord2f;
                                m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
                                m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
                                m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                               R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
-                               m.tex[2] = R_GetTexture(r_shadow_attenuation2dtexture);
-#ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[2] = vertex3f;
-                               m.texmatrix[2] = r_shadow_entitytoattenuationxyz;
-#else
-                               m.pointer_texcoord[2] = varray_texcoord2f[2];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
-#endif
-                               m.tex[3] = R_GetTexture(r_shadow_attenuation2dtexture);
-#ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[3] = vertex3f;
-                               m.texmatrix[3] = r_shadow_entitytoattenuationz;
-#else
-                               m.pointer_texcoord[3] = varray_texcoord2f[3];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[3] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
-#endif
+                               R_Shadow_GenTexCoords_Specular_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin);
                                R_Mesh_State(&m);
                                GL_ColorMask(0,0,0,1);
-                               GL_BlendFunc(GL_ONE, GL_ZERO);
+                               // this squares the result
+                               GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
                                GL_LockArrays(firstvertex, numvertices);
                                R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
                                GL_LockArrays(0, 0);
@@ -2119,24 +2257,22 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
 
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(basetexture);
-                               m.pointer_texcoord[0] = texcoord2f;
-                               if (r_shadow_lightcubemap != r_texture_whitecube)
-                               {
-                                       m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
-#ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[1] = vertex3f;
-                                       m.texmatrix[1] = r_shadow_entitytolight;
-#else
-                                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
-#endif
-                               }
-                               GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
-                       }
-                       else
-                       {
-                               // 2/2/2 2D combine path (any dot3 card)
+                               R_Mesh_State(&m);
+                               GL_LockArrays(firstvertex, numvertices);
+                               // square alpha in framebuffer a few times to make it shiny
+                               GL_BlendFunc(GL_ZERO, GL_DST_ALPHA);
+                               // these comments are a test run through this math for intensity 0.5
+                               // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier)
+                               // 0.25 * 0.25 = 0.0625 (this is another pass)
+                               // 0.0625 * 0.0625 = 0.00390625 (this is another pass)
+                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                               c_rt_lightmeshes++;
+                               c_rt_lighttris += numtriangles;
+                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                               c_rt_lightmeshes++;
+                               c_rt_lighttris += numtriangles;
+                               GL_LockArrays(0, 0);
+
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
                                m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
@@ -2155,24 +2291,6 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
                                m.pointer_texcoord[1] = varray_texcoord2f[1];
                                R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
 #endif
-                               R_Mesh_State(&m);
-                               GL_ColorMask(0,0,0,1);
-                               GL_BlendFunc(GL_ONE, GL_ZERO);
-                               GL_LockArrays(firstvertex, numvertices);
-                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                               GL_LockArrays(0, 0);
-                               c_rt_lightmeshes++;
-                               c_rt_lighttris += numtriangles;
-
-                               memset(&m, 0, sizeof(m));
-                               m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(bumptexture);
-                               m.texcombinergb[0] = GL_REPLACE;
-                               m.pointer_texcoord[0] = texcoord2f;
-                               m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
-                               m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
-                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                               R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin);
                                R_Mesh_State(&m);
                                GL_BlendFunc(GL_DST_ALPHA, GL_ZERO);
                                GL_LockArrays(firstvertex, numvertices);
@@ -2183,7 +2301,7 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
 
                                memset(&m, 0, sizeof(m));
                                m.pointer_vertex = vertex3f;
-                               m.tex[0] = R_GetTexture(basetexture);
+                               m.tex[0] = R_GetTexture(glosstexture);
                                m.pointer_texcoord[0] = texcoord2f;
                                if (r_shadow_lightcubemap != r_texture_whitecube)
                                {
@@ -2198,7 +2316,6 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
                                }
                                GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
                        }
-                       // this final code is shared
                        R_Mesh_State(&m);
                        GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0);
                        VectorScale(lightcolorbase, colorscale, color2);
@@ -2212,351 +2329,148 @@ void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles,
                        }
                        GL_LockArrays(0, 0);
                }
-               if (specularscale && glosstexture != r_texture_black)
-               {
-                       // FIXME: detect blendsquare!
-                       //if (gl_support_blendsquare)
-                       {
-                               colorscale = specularscale;
-                               GL_Color(1,1,1,1);
-                               if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap != r_texture_whitecube /* && gl_support_blendsquare*/) // FIXME: detect blendsquare!
-                               {
-                                       // 2/0/0/1/2 3D combine blendsquare path
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex[0] = R_GetTexture(bumptexture);
-                                       m.pointer_texcoord[0] = texcoord2f;
-                                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
-                                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
-                                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                       R_Shadow_GenTexCoords_Specular_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin);
-                                       R_Mesh_State(&m);
-                                       GL_ColorMask(0,0,0,1);
-                                       // this squares the result
-                                       GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       GL_LockArrays(0, 0);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       R_Mesh_State(&m);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       // square alpha in framebuffer a few times to make it shiny
-                                       GL_BlendFunc(GL_ZERO, GL_DST_ALPHA);
-                                       // these comments are a test run through this math for intensity 0.5
-                                       // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier)
-                                       // 0.25 * 0.25 = 0.0625 (this is another pass)
-                                       // 0.0625 * 0.0625 = 0.00390625 (this is another pass)
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-                                       GL_LockArrays(0, 0);
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture);
-#ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[0] = vertex3f;
-                                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
-#else
-                                       m.pointer_texcoord3f[0] = varray_texcoord3f[0];
-                                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
-#endif
-                                       R_Mesh_State(&m);
-                                       GL_BlendFunc(GL_DST_ALPHA, GL_ZERO);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       GL_LockArrays(0, 0);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex[0] = R_GetTexture(glosstexture);
-                                       m.pointer_texcoord[0] = texcoord2f;
-                                       if (r_shadow_lightcubemap != r_texture_whitecube)
-                                       {
-                                               m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
-#ifdef USETEXMATRIX
-                                               m.pointer_texcoord3f[1] = vertex3f;
-                                               m.texmatrix[1] = r_shadow_entitytolight;
-#else
-                                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
-#endif
-                                       }
-                                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
-                               }
-                               else if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_lightcubemap == r_texture_whitecube /* && gl_support_blendsquare*/) // FIXME: detect blendsquare!
-                               {
-                                       // 2/0/0/2 3D combine blendsquare path
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex[0] = R_GetTexture(bumptexture);
-                                       m.pointer_texcoord[0] = texcoord2f;
-                                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
-                                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
-                                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                       R_Shadow_GenTexCoords_Specular_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin);
-                                       R_Mesh_State(&m);
-                                       GL_ColorMask(0,0,0,1);
-                                       // this squares the result
-                                       GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       GL_LockArrays(0, 0);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       R_Mesh_State(&m);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       // square alpha in framebuffer a few times to make it shiny
-                                       GL_BlendFunc(GL_ZERO, GL_DST_ALPHA);
-                                       // these comments are a test run through this math for intensity 0.5
-                                       // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier)
-                                       // 0.25 * 0.25 = 0.0625 (this is another pass)
-                                       // 0.0625 * 0.0625 = 0.00390625 (this is another pass)
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-                                       GL_LockArrays(0, 0);
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex[0] = R_GetTexture(glosstexture);
-                                       m.pointer_texcoord[0] = texcoord2f;
-                                       m.tex3d[1] = R_GetTexture(r_shadow_attenuation3dtexture);
-#ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[1] = vertex3f;
-                                       m.texmatrix[1] = r_shadow_entitytoattenuationxyz;
-#else
-                                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                       R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
-#endif
-                                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
-                               }
-                               else
-                               {
-                                       // 2/0/0/2/2 2D combine blendsquare path
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex[0] = R_GetTexture(bumptexture);
-                                       m.pointer_texcoord[0] = texcoord2f;
-                                       m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube);
-                                       m.texcombinergb[1] = GL_DOT3_RGBA_ARB;
-                                       m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                       R_Shadow_GenTexCoords_Specular_NormalCubeMap(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, svector3f + 3 * firstvertex, tvector3f + 3 * firstvertex, normal3f + 3 * firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin);
-                                       R_Mesh_State(&m);
-                                       GL_ColorMask(0,0,0,1);
-                                       // this squares the result
-                                       GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       GL_LockArrays(0, 0);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       R_Mesh_State(&m);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       // square alpha in framebuffer a few times to make it shiny
-                                       GL_BlendFunc(GL_ZERO, GL_DST_ALPHA);
-                                       // these comments are a test run through this math for intensity 0.5
-                                       // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier)
-                                       // 0.25 * 0.25 = 0.0625 (this is another pass)
-                                       // 0.0625 * 0.0625 = 0.00390625 (this is another pass)
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-                                       GL_LockArrays(0, 0);
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture);
-#ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[0] = vertex3f;
-                                       m.texmatrix[0] = r_shadow_entitytoattenuationxyz;
-#else
-                                       m.pointer_texcoord[0] = varray_texcoord2f[0];
-                                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[0] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
-#endif
-                                       m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
-#ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[1] = vertex3f;
-                                       m.texmatrix[1] = r_shadow_entitytoattenuationz;
-#else
-                                       m.pointer_texcoord[1] = varray_texcoord2f[1];
-                                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
-#endif
-                                       R_Mesh_State(&m);
-                                       GL_BlendFunc(GL_DST_ALPHA, GL_ZERO);
-                                       GL_LockArrays(firstvertex, numvertices);
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       GL_LockArrays(0, 0);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-
-                                       memset(&m, 0, sizeof(m));
-                                       m.pointer_vertex = vertex3f;
-                                       m.tex[0] = R_GetTexture(glosstexture);
-                                       m.pointer_texcoord[0] = texcoord2f;
-                                       if (r_shadow_lightcubemap != r_texture_whitecube)
-                                       {
-                                               m.texcubemap[1] = R_GetTexture(r_shadow_lightcubemap);
-#ifdef USETEXMATRIX
-                                               m.pointer_texcoord3f[1] = vertex3f;
-                                               m.texmatrix[1] = r_shadow_entitytolight;
-#else
-                                               m.pointer_texcoord3f[1] = varray_texcoord3f[1];
-                                               R_Shadow_Transform_Vertex3f_TexCoord3f(varray_texcoord3f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytolight);
-#endif
-                                       }
-                                       GL_BlendFunc(GL_DST_ALPHA, GL_ONE);
-                               }
-                               R_Mesh_State(&m);
-                               GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0);
-                               VectorScale(lightcolorbase, colorscale, color2);
-                               GL_LockArrays(firstvertex, numvertices);
-                               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                               {
-                                       GL_Color(bound(0, color2[0], 1), bound(0, color2[1], 1), bound(0, color2[2], 1), 1);
-                                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                                       c_rt_lightmeshes++;
-                                       c_rt_lighttris += numtriangles;
-                               }
-                               GL_LockArrays(0, 0);
-                       }
-               }
        }
-       else if (r_shadowstage == R_SHADOWSTAGE_LIGHT_VERTEX)
+}
+
+void R_Shadow_RenderLighting_Light_Vertex(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture, float specularscale)
+{
+       int renders;
+       float color[3], color2[3];
+       rmeshstate_t m;
+       // TODO: add direct pants/shirt rendering
+       if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
+               R_Shadow_RenderLighting_Light_Vertex(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL, 0);
+       if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
+               R_Shadow_RenderLighting_Light_Vertex(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL, 0);
+       if (r_shadow_rtlight->ambientscale)
        {
-               // TODO: add direct pants/shirt rendering
-               if (pantstexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorpants) > 0.001)
-                       R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorpants, vec3_origin, vec3_origin, pantstexture, r_texture_black, r_texture_black, bumptexture, NULL);
-               if (shirttexture && (r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorshirt) > 0.001)
-                       R_Shadow_RenderLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorshirt, vec3_origin, vec3_origin, shirttexture, r_texture_black, r_texture_black, bumptexture, NULL);
-               if (r_shadow_rtlight->ambientscale)
+               GL_BlendFunc(GL_ONE, GL_ONE);
+               VectorScale(lightcolorbase, r_shadow_rtlight->ambientscale, color2);
+               memset(&m, 0, sizeof(m));
+               m.pointer_vertex = vertex3f;
+               m.tex[0] = R_GetTexture(basetexture);
+               m.pointer_texcoord[0] = texcoord2f;
+               if (r_textureunits.integer >= 2)
                {
-                       GL_BlendFunc(GL_ONE, GL_ONE);
-                       VectorScale(lightcolorbase, r_shadow_rtlight->ambientscale, color2);
-                       memset(&m, 0, sizeof(m));
-                       m.pointer_vertex = vertex3f;
-                       m.tex[0] = R_GetTexture(basetexture);
-                       m.pointer_texcoord[0] = texcoord2f;
-                       if (r_textureunits.integer >= 2)
-                       {
-                               // voodoo2
-                               m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       // voodoo2
+                       m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[1] = vertex3f;
-                               m.texmatrix[1] = r_shadow_entitytoattenuationxyz;
+                       m.pointer_texcoord3f[1] = vertex3f;
+                       m.texmatrix[1] = r_shadow_entitytoattenuationxyz;
 #else
-                               m.pointer_texcoord[1] = varray_texcoord2f[1];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+                       m.pointer_texcoord[1] = varray_texcoord2f[1];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               if (r_textureunits.integer >= 3)
-                               {
-                                       // Geforce3/Radeon class but not using dot3
-                                       m.tex[2] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       if (r_textureunits.integer >= 3)
+                       {
+                               // Geforce3/Radeon class but not using dot3
+                               m.tex[2] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[2] = vertex3f;
-                                       m.texmatrix[2] = r_shadow_entitytoattenuationz;
+                               m.pointer_texcoord3f[2] = vertex3f;
+                               m.texmatrix[2] = r_shadow_entitytoattenuationz;
 #else
-                                       m.pointer_texcoord[2] = varray_texcoord2f[2];
-                                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+                               m.pointer_texcoord[2] = varray_texcoord2f[2];
+                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
 #endif
-                               }
                        }
+               }
+               if (r_textureunits.integer >= 3)
+                       m.pointer_color = NULL;
+               else
+                       m.pointer_color = varray_color4f;
+               R_Mesh_State(&m);
+               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
+               {
+                       color[0] = bound(0, color2[0], 1);
+                       color[1] = bound(0, color2[1], 1);
+                       color[2] = bound(0, color2[2], 1);
                        if (r_textureunits.integer >= 3)
-                               m.pointer_color = NULL;
+                               GL_Color(color[0], color[1], color[2], 1);
+                       else if (r_textureunits.integer >= 2)
+                               R_Shadow_VertexNoShadingWithZAttenuation(numvertices, vertex3f + 3 * firstvertex, color);
                        else
-                               m.pointer_color = varray_color4f;
-                       R_Mesh_State(&m);
-                       for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                       {
-                               color[0] = bound(0, color2[0], 1);
-                               color[1] = bound(0, color2[1], 1);
-                               color[2] = bound(0, color2[2], 1);
-                               if (r_textureunits.integer >= 3)
-                                       GL_Color(color[0], color[1], color[2], 1);
-                               else if (r_textureunits.integer >= 2)
-                                       R_Shadow_VertexNoShadingWithZAttenuation(numvertices, vertex3f + 3 * firstvertex, color);
-                               else
-                                       R_Shadow_VertexNoShadingWithXYZAttenuation(numvertices, vertex3f + 3 * firstvertex, color);
-                               GL_LockArrays(firstvertex, numvertices);
-                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                               GL_LockArrays(0, 0);
-                               c_rt_lightmeshes++;
-                               c_rt_lighttris += numtriangles;
-                       }
+                               R_Shadow_VertexNoShadingWithXYZAttenuation(numvertices, vertex3f + 3 * firstvertex, color);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
                }
-               if (r_shadow_rtlight->diffusescale)
+       }
+       if (r_shadow_rtlight->diffusescale)
+       {
+               GL_BlendFunc(GL_ONE, GL_ONE);
+               VectorScale(lightcolorbase, r_shadow_rtlight->diffusescale, color2);
+               memset(&m, 0, sizeof(m));
+               m.pointer_vertex = vertex3f;
+               m.pointer_color = varray_color4f;
+               m.tex[0] = R_GetTexture(basetexture);
+               m.pointer_texcoord[0] = texcoord2f;
+               if (r_textureunits.integer >= 2)
                {
-                       GL_BlendFunc(GL_ONE, GL_ONE);
-                       VectorScale(lightcolorbase, r_shadow_rtlight->diffusescale, color2);
-                       memset(&m, 0, sizeof(m));
-                       m.pointer_vertex = vertex3f;
-                       m.pointer_color = varray_color4f;
-                       m.tex[0] = R_GetTexture(basetexture);
-                       m.pointer_texcoord[0] = texcoord2f;
-                       if (r_textureunits.integer >= 2)
-                       {
-                               // voodoo2
-                               m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       // voodoo2
+                       m.tex[1] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                               m.pointer_texcoord3f[1] = vertex3f;
-                               m.texmatrix[1] = r_shadow_entitytoattenuationxyz;
+                       m.pointer_texcoord3f[1] = vertex3f;
+                       m.texmatrix[1] = r_shadow_entitytoattenuationxyz;
 #else
-                               m.pointer_texcoord[1] = varray_texcoord2f[1];
-                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
+                       m.pointer_texcoord[1] = varray_texcoord2f[1];
+                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[1] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationxyz);
 #endif
-                               if (r_textureunits.integer >= 3)
-                               {
-                                       // Geforce3/Radeon class but not using dot3
-                                       m.tex[2] = R_GetTexture(r_shadow_attenuation2dtexture);
+                       if (r_textureunits.integer >= 3)
+                       {
+                               // Geforce3/Radeon class but not using dot3
+                               m.tex[2] = R_GetTexture(r_shadow_attenuation2dtexture);
 #ifdef USETEXMATRIX
-                                       m.pointer_texcoord3f[2] = vertex3f;
-                                       m.texmatrix[2] = r_shadow_entitytoattenuationz;
+                               m.pointer_texcoord3f[2] = vertex3f;
+                               m.texmatrix[2] = r_shadow_entitytoattenuationz;
 #else
-                                       m.pointer_texcoord[2] = varray_texcoord2f[2];
-                                       R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
+                               m.pointer_texcoord[2] = varray_texcoord2f[2];
+                               R_Shadow_Transform_Vertex3f_TexCoord2f(varray_texcoord2f[2] + 3 * firstvertex, numvertices, vertex3f + 3 * firstvertex, &r_shadow_entitytoattenuationz);
 #endif
-                               }
-                       }
-                       R_Mesh_State(&m);
-                       for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
-                       {
-                               color[0] = bound(0, color2[0], 1);
-                               color[1] = bound(0, color2[1], 1);
-                               color[2] = bound(0, color2[2], 1);
-                               if (r_textureunits.integer >= 3)
-                                       R_Shadow_VertexShading(numvertices, vertex3f + 3 * firstvertex, normal3f + 3 * firstvertex, color);
-                               else if (r_textureunits.integer >= 2)
-                                       R_Shadow_VertexShadingWithZAttenuation(numvertices, vertex3f + 3 * firstvertex, normal3f + 3 * firstvertex, color);
-                               else
-                                       R_Shadow_VertexShadingWithXYZAttenuation(numvertices, vertex3f + 3 * firstvertex, normal3f + 3 * firstvertex, color);
-                               GL_LockArrays(firstvertex, numvertices);
-                               R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
-                               GL_LockArrays(0, 0);
-                               c_rt_lightmeshes++;
-                               c_rt_lighttris += numtriangles;
                        }
                }
+               R_Mesh_State(&m);
+               for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--)
+               {
+                       color[0] = bound(0, color2[0], 1);
+                       color[1] = bound(0, color2[1], 1);
+                       color[2] = bound(0, color2[2], 1);
+                       if (r_textureunits.integer >= 3)
+                               R_Shadow_VertexShading(numvertices, vertex3f + 3 * firstvertex, normal3f + 3 * firstvertex, color);
+                       else if (r_textureunits.integer >= 2)
+                               R_Shadow_VertexShadingWithZAttenuation(numvertices, vertex3f + 3 * firstvertex, normal3f + 3 * firstvertex, color);
+                       else
+                               R_Shadow_VertexShadingWithXYZAttenuation(numvertices, vertex3f + 3 * firstvertex, normal3f + 3 * firstvertex, color);
+                       GL_LockArrays(firstvertex, numvertices);
+                       R_Mesh_Draw(firstvertex, numvertices, numtriangles, elements);
+                       GL_LockArrays(0, 0);
+                       c_rt_lightmeshes++;
+                       c_rt_lighttris += numtriangles;
+               }
+       }
+}
+
+void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture, float specularscale)
+{
+       // FIXME: support MATERIALFLAG_NODEPTHTEST
+       switch (r_shadowstage)
+       {
+       case R_SHADOWSTAGE_VISIBLELIGHTING:
+               R_Shadow_RenderLighting_VisibleLighting(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, pantstexture, shirttexture, bumptexture, glosstexture, specularscale);
+               break;
+       case R_SHADOWSTAGE_LIGHT_GLSL:
+               R_Shadow_RenderLighting_Light_GLSL(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, pantstexture, shirttexture, bumptexture, glosstexture, specularscale);
+               break;
+       case R_SHADOWSTAGE_LIGHT_DOT3:
+               R_Shadow_RenderLighting_Light_Dot3(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, pantstexture, shirttexture, bumptexture, glosstexture, specularscale);
+               break;
+       case R_SHADOWSTAGE_LIGHT_VERTEX:
+               R_Shadow_RenderLighting_Light_Vertex(firstvertex, numvertices, numtriangles, elements, vertex3f, svector3f, tvector3f, normal3f, texcoord2f, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, pantstexture, shirttexture, bumptexture, glosstexture, specularscale);
+               break;
+       default:
+               Con_Printf("R_Shadow_RenderLighting: unknown r_shadowstage %i\n", r_shadowstage);
+               break;
        }
 }
 
@@ -2632,7 +2546,7 @@ void R_RTLight_Compile(rtlight_t *rtlight)
 
        if (model && model->GetLightInfo)
        {
-               // this variable directs the DrawShadowVolume and DrawLight code to capture into the mesh chain instead of rendering
+               // this variable must be set for the CompileShadowVolume code
                r_shadow_compilingrtlight = rtlight;
                R_Shadow_EnlargeLeafSurfaceBuffer(model->brush.num_leafs, model->num_surfaces);
                model->GetLightInfo(ent, rtlight->shadoworigin, rtlight->radius, rtlight->cullmins, rtlight->cullmaxs, r_shadow_buffer_leaflist, r_shadow_buffer_leafpvs, &numleafs, r_shadow_buffer_surfacelist, r_shadow_buffer_surfacepvs, &numsurfaces);
@@ -2650,13 +2564,9 @@ void R_RTLight_Compile(rtlight_t *rtlight)
                        memcpy(rtlight->static_leafpvs, r_shadow_buffer_leafpvs, rtlight->static_numleafpvsbytes);
                if (numsurfaces)
                        memcpy(rtlight->static_surfacelist, r_shadow_buffer_surfacelist, rtlight->static_numsurfaces * sizeof(*rtlight->static_surfacelist));
-               if (model->DrawShadowVolume && rtlight->shadow)
-               {
-                       rtlight->static_meshchain_shadow = Mod_ShadowMesh_Begin(r_shadow_mempool, 32768, 32768, NULL, NULL, NULL, false, false, true);
-                       model->DrawShadowVolume(ent, rtlight->shadoworigin, rtlight->radius, numsurfaces, r_shadow_buffer_surfacelist, rtlight->cullmins, rtlight->cullmaxs);
-                       rtlight->static_meshchain_shadow = Mod_ShadowMesh_Finish(r_shadow_mempool, rtlight->static_meshchain_shadow, false, false);
-               }
-               // switch back to rendering when DrawShadowVolume or DrawLight is called
+               if (model->CompileShadowVolume && rtlight->shadow)
+                       model->CompileShadowVolume(ent, rtlight->shadoworigin, rtlight->radius, numsurfaces, r_shadow_buffer_surfacelist);
+               // now we're done compiling the rtlight
                r_shadow_compilingrtlight = NULL;
        }
 

diff --git a/r_shadow.h b/r_shadow.h
index 23d2a48138b7af3ab7b80f85839f8901b20f0db0..5c688ab3c5e88919c1bfc3894d8bdda3a8b9bd45 100644 (file)
--- a/r_shadow.h
+++ b/r_shadow.h
@@ -36,7 +36,7 @@ extern mempool_t *r_shadow_mempool;
 void R_Shadow_Init(void);
 void R_Shadow_VolumeFromList(int numverts, int numtris, const float *invertex3f, const int *elements, const int *neighbors, const vec3_t projectorigin, float projectdistance, int nummarktris, const int *marktris);
 void R_Shadow_MarkVolumeFromBox(int firsttriangle, int numtris, const float *invertex3f, const int *elements, const vec3_t projectorigin, const vec3_t lightmins, const vec3_t lightmaxs, const vec3_t surfacemins, const vec3_t surfacemaxs);
-void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture);
+void R_Shadow_RenderLighting(int firstvertex, int numvertices, int numtriangles, const int *elements, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, const float *lightcolorbase, const float *lightcolorpants, const float *lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *bumptexture, rtexture_t *glosstexture, float specularscale);
 // light currently being rendered
 extern rtlight_t *r_shadow_rtlight;