X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rsurf.c;h=34aef9189799fe4466054248752bf1ee0fb7de38;hp=b8506b6b9af4bf0d15b883a363e96d0f6499795d;hb=9fb392ea7f82bb41cfb866837cc9e9cade57eb4b;hpb=deb439e4d0f954489242e932c0fefee5cc2b3f77

diff --git a/gl_rsurf.c b/gl_rsurf.c
index b8506b6b..34aef918 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -22,11 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "r_shadow.h"
 #include "portals.h"
+#include "csprogs.h"
 
 cvar_t r_ambient = {0, "r_ambient", "0", "brightens map, value is 0-128"};
 cvar_t r_lockpvs = {0, "r_lockpvs", "0", "disables pvs switching, allows you to walk around and inspect what is visible from a given location in the map (anything not visible from your current location will not be drawn)"};
 cvar_t r_lockvisibility = {0, "r_lockvisibility", "0", "disables visibility updates, allows you to walk around and inspect what is visible from a given viewpoint in the map (anything offscreen at the moment this is enabled will not be drawn)"};
-cvar_t r_useportalculling = {0, "r_useportalculling", "1", "improve framerate with r_novis 1 by using portal culling - still not as good as compiled visibility data in the map, but it helps (a value of 2 forces use of this even with vis data, which improves framerates in maps without too much complexity, but hurts in extremely complex maps, which is why 2 is not the default mode)"};
+cvar_t r_useportalculling = {0, "r_useportalculling", "2", "improve framerate with r_novis 1 by using portal culling - still not as good as compiled visibility data in the map, but it helps (a value of 2 forces use of this even with vis data, which improves framerates in maps without too much complexity, but hurts in extremely complex maps, which is why 2 is not the default mode)"};
+cvar_t r_usesurfaceculling = {0, "r_usesurfaceculling", "1", "skip off-screen surfaces (1 = cull surfaces if the map is likely to benefit, 2 = always cull surfaces)"};
 cvar_t r_q3bsp_renderskydepth = {0, "r_q3bsp_renderskydepth", "0", "draws sky depth masking in q3 maps (as in q1 maps), this means for example that sky polygons can hide other things"};
 
 /*
@@ -118,7 +120,7 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
 		}
 	}
 
-	R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], smax, tmax);
+	R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1);
 
 	// update the surface's deluxemap if it has one
 	if (surface->deluxemaptexture != r_texture_blanknormalmap)
@@ -156,7 +158,7 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
 			l = (int)(n[2] * 128 + 128);out[0] = bound(0, l, 255);
 			out[3] = 255;
 		}
-		R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], smax, tmax);
+		R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1);
 	}
 }
 
@@ -344,14 +346,11 @@ static void R_DrawPortal_Callback(const entity_render_t *ent, const rtlight_t *r
 	GL_PolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);
 	GL_DepthTest(true);
 	GL_CullFace(GL_NONE);
-	R_Mesh_Matrix(&identitymatrix);
+	R_EntityMatrix(&identitymatrix);
 
 	numpoints = min(portal->numpoints, POLYGONELEMENTS_MAXPOINTS);
 
-	R_Mesh_VertexPointer(vertex3f, 0, 0);
-	R_Mesh_ColorPointer(NULL, 0, 0);
-	R_Mesh_ResetTextureState();
-	R_SetupGenericShader(false);
+//	R_Mesh_ResetTextureState();
 
 	isvis = (portal->here->clusterindex >= 0 && portal->past->clusterindex >= 0 && portal->here->clusterindex != portal->past->clusterindex);
 
@@ -362,7 +361,9 @@ static void R_DrawPortal_Callback(const entity_render_t *ent, const rtlight_t *r
 			 isvis ? 0.125f : 0.03125f);
 	for (i = 0, v = vertex3f;i < numpoints;i++, v += 3)
 		VectorCopy(portal->points[i].position, v);
-	R_Mesh_Draw(0, numpoints, 0, numpoints - 2, polygonelement3i, polygonelement3s, 0, 0);
+	R_Mesh_PrepareVertices_Generic_Arrays(numpoints, vertex3f, NULL, NULL);
+	R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1, false, false);
+	R_Mesh_Draw(0, numpoints, 0, numpoints - 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 }
 
 // LordHavoc: this is just a nice debugging tool, very slow
@@ -396,6 +397,29 @@ void R_DrawPortals(void)
 	}
 }
 
+static void R_View_WorldVisibility_CullSurfaces(void)
+{
+	int surfaceindex;
+	int surfaceindexstart;
+	int surfaceindexend;
+	unsigned char *surfacevisible;
+	msurface_t *surfaces;
+	dp_model_t *model = r_refdef.scene.worldmodel;
+	if (!model)
+		return;
+	if (r_trippy.integer)
+		return;
+	if (r_usesurfaceculling.integer < 1)
+		return;
+	surfaceindexstart = model->firstmodelsurface;
+	surfaceindexend = surfaceindexstart + model->nummodelsurfaces;
+	surfaces = model->data_surfaces;
+	surfacevisible = r_refdef.viewcache.world_surfacevisible;
+	for (surfaceindex = surfaceindexstart;surfaceindex < surfaceindexend;surfaceindex++)
+		if (surfacevisible[surfaceindex] && R_CullBox(surfaces[surfaceindex].mins, surfaces[surfaceindex].maxs))
+			surfacevisible[surfaceindex] = 0;
+}
+
 void R_View_WorldVisibility(qboolean forcenovis)
 {
 	int i, j, *mark;
@@ -426,6 +450,7 @@ void R_View_WorldVisibility(qboolean forcenovis)
 						r_refdef.viewcache.world_surfacevisible[*mark] = true;
 			}
 		}
+		R_View_WorldVisibility_CullSurfaces();
 		return;
 	}
 
@@ -445,7 +470,7 @@ void R_View_WorldVisibility(qboolean forcenovis)
 
 		// if floating around in the void (no pvs data available, and no
 		// portals available), simply use all on-screen leafs.
-		if (!viewleaf || viewleaf->clusterindex < 0 || forcenovis)
+		if (!viewleaf || viewleaf->clusterindex < 0 || forcenovis || r_trippy.integer)
 		{
 			// no visibility method: (used when floating around in the void)
 			// simply cull each leaf to the frustum (view pyramid)
@@ -453,6 +478,8 @@ void R_View_WorldVisibility(qboolean forcenovis)
 			r_refdef.viewcache.world_novis = true;
 			for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++)
 			{
+				if (leaf->clusterindex < 0)
+					continue;
 				// if leaf is in current pvs and on the screen, mark its surfaces
 				if (!R_CullBox(leaf->mins, leaf->maxs))
 				{
@@ -474,6 +501,8 @@ void R_View_WorldVisibility(qboolean forcenovis)
 			// similar to quake's RecursiveWorldNode but without cache misses
 			for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++)
 			{
+				if (leaf->clusterindex < 0)
+					continue;
 				// if leaf is in current pvs and on the screen, mark its surfaces
 				if (CHECKPVSBIT(r_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs))
 				{
@@ -506,6 +535,8 @@ void R_View_WorldVisibility(qboolean forcenovis)
 				leaf = leafstack[--leafstackpos];
 				if (r_refdef.viewcache.world_leafvisible[leaf - model->brush.data_leafs])
 					continue;
+				if (leaf->clusterindex < 0)
+					continue;
 				r_refdef.stats.world_leafs++;
 				r_refdef.viewcache.world_leafvisible[leaf - model->brush.data_leafs] = true;
 				// mark any surfaces bounding this leaf
@@ -532,6 +563,8 @@ void R_View_WorldVisibility(qboolean forcenovis)
 			}
 		}
 	}
+
+        R_View_WorldVisibility_CullSurfaces();
 }
 
 void R_Q1BSP_DrawSky(entity_render_t *ent)
@@ -544,10 +577,10 @@ void R_Q1BSP_DrawSky(entity_render_t *ent)
 		R_DrawModelSurfaces(ent, true, true, false, false, false);
 }
 
-extern void R_Water_AddWaterPlane(msurface_t *surface);
+extern void R_Water_AddWaterPlane(msurface_t *surface, int entno);
 void R_Q1BSP_DrawAddWaterPlanes(entity_render_t *ent)
 {
-	int i, j, flagsmask;
+	int i, j, n, flagsmask;
 	dp_model_t *model = ent->model;
 	msurface_t *surfaces;
 	if (model == NULL)
@@ -556,10 +589,10 @@ void R_Q1BSP_DrawAddWaterPlanes(entity_render_t *ent)
 	if (ent == r_refdef.scene.worldentity)
 		RSurf_ActiveWorldEntity();
 	else
-		RSurf_ActiveModelEntity(ent, false, false, false);
+		RSurf_ActiveModelEntity(ent, true, false, false);
 
 	surfaces = model->data_surfaces;
-	flagsmask = MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION;
+	flagsmask = MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA;
 
 	// add visible surfaces to draw list
 	if (ent == r_refdef.scene.worldentity)
@@ -569,16 +602,20 @@ void R_Q1BSP_DrawAddWaterPlanes(entity_render_t *ent)
 			j = model->sortedmodelsurfaces[i];
 			if (r_refdef.viewcache.world_surfacevisible[j])
 				if (surfaces[j].texture->basematerialflags & flagsmask)
-					R_Water_AddWaterPlane(surfaces + j);
+					R_Water_AddWaterPlane(surfaces + j, 0);
 		}
 	}
 	else
 	{
+		if(ent->entitynumber >= MAX_EDICTS) // && CL_VM_TransformView(ent->entitynumber - MAX_EDICTS, NULL, NULL, NULL))
+			n = ent->entitynumber;
+		else
+			n = 0;
 		for (i = 0;i < model->nummodelsurfaces;i++)
 		{
 			j = model->sortedmodelsurfaces[i];
 			if (surfaces[j].texture->basematerialflags & flagsmask)
-				R_Water_AddWaterPlane(surfaces + j);
+				R_Water_AddWaterPlane(surfaces + j, n);
 		}
 	}
 	rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveWorldEntity/RSurf_ActiveModelEntity
@@ -605,10 +642,8 @@ void R_Q1BSP_DrawDepth(entity_render_t *ent)
 	GL_DepthTest(true);
 	GL_BlendFunc(GL_ONE, GL_ZERO);
 	GL_DepthMask(true);
-	GL_AlphaTest(false);
-	R_Mesh_ColorPointer(NULL, 0, 0);
-	R_Mesh_ResetTextureState();
-	R_SetupDepthOrShadowShader();
+//	R_Mesh_ResetTextureState();
+	R_SetupShader_DepthOrShadow(false);
 	if (ent == r_refdef.scene.worldentity)
 		R_DrawWorldSurfaces(false, false, true, false, false);
 	else
@@ -664,230 +699,436 @@ typedef struct r_q1bsp_getlightinfo_s
 }
 r_q1bsp_getlightinfo_t;
 
-static void R_Q1BSP_RecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, mnode_t *node)
+#define GETLIGHTINFO_MAXNODESTACK 4096
+
+static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboolean skipsurfaces)
 {
+	// nodestack
+	mnode_t *nodestack[GETLIGHTINFO_MAXNODESTACK];
+	int nodestackpos = 0;
+	// node processing
+	mplane_t *plane;
+	mnode_t *node;
 	int sides;
+	// leaf processing
 	mleaf_t *leaf;
-	for (;;)
+	const msurface_t *surface;
+	const msurface_t *surfaces = info->model->data_surfaces;
+	int numleafsurfaces;
+	int leafsurfaceindex;
+	int surfaceindex;
+	int triangleindex, t;
+	int currentmaterialflags;
+	qboolean castshadow;
+	const int *e;
+	const vec_t *v[3];
+	float v2[3][3];
+	qboolean insidebox;
+	qboolean frontsidecasting = r_shadow_frontsidecasting.integer != 0;
+	qboolean svbspactive = info->svbsp_active;
+	qboolean svbspinsertoccluder = info->svbsp_insertoccluder;
+	const int *leafsurfaceindices;
+	qboolean addedtris;
+	int i;
+	mportal_t *portal;
+	static float points[128][3];
+	// push the root node onto our nodestack
+	nodestack[nodestackpos++] = info->model->brush.data_nodes;
+	// we'll be done when the nodestack is empty
+	while (nodestackpos)
 	{
-		mplane_t *plane = node->plane;
-		//if (!BoxesOverlap(info->lightmins, info->lightmaxs, node->mins, node->maxs))
-		//	return;
-		if (!plane)
-			break;
-		//if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes))
-		//	return;
-		if (plane->type < 3)
+		// get a node from the stack to process
+		node = nodestack[--nodestackpos];
+		// is it a node or a leaf?
+		plane = node->plane;
+		if (plane)
 		{
-			if (info->lightmins[plane->type] > plane->dist)
-				node = node->children[0];
-			else if (info->lightmaxs[plane->type] < plane->dist)
-				node = node->children[1];
-			else if (info->relativelightorigin[plane->type] >= plane->dist)
+			// node
+#if 0
+			if (!BoxesOverlap(info->lightmins, info->lightmaxs, node->mins, node->maxs))
+				continue;
+#endif
+#if 0
+			if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes))
+				continue;
+#endif
+			// axial planes can be processed much more quickly
+			if (plane->type < 3)
 			{
-				R_Q1BSP_RecursiveGetLightInfo(info, node->children[0]);
-				node = node->children[1];
+				// axial plane
+				if (info->lightmins[plane->type] > plane->dist)
+					nodestack[nodestackpos++] = node->children[0];
+				else if (info->lightmaxs[plane->type] < plane->dist)
+					nodestack[nodestackpos++] = node->children[1];
+				else
+				{
+					// recurse front side first because the svbsp building prefers it
+					if (info->relativelightorigin[plane->type] >= plane->dist)
+					{
+						if (nodestackpos < GETLIGHTINFO_MAXNODESTACK)
+							nodestack[nodestackpos++] = node->children[0];
+						nodestack[nodestackpos++] = node->children[1];
+					}
+					else
+					{
+						if (nodestackpos < GETLIGHTINFO_MAXNODESTACK)
+							nodestack[nodestackpos++] = node->children[1];
+						nodestack[nodestackpos++] = node->children[0];
+					}
+				}
 			}
 			else
 			{
-				R_Q1BSP_RecursiveGetLightInfo(info, node->children[1]);
-				node = node->children[0];
+				// sloped plane
+				sides = BoxOnPlaneSide(info->lightmins, info->lightmaxs, plane);
+				switch (sides)
+				{
+				default:
+					continue; // ERROR: NAN bounding box!
+				case 1:
+					nodestack[nodestackpos++] = node->children[0];
+					break;
+				case 2:
+					nodestack[nodestackpos++] = node->children[1];
+					break;
+				case 3:
+					// recurse front side first because the svbsp building prefers it
+					if (PlaneDist(info->relativelightorigin, plane) >= 0)
+					{
+						if (nodestackpos < GETLIGHTINFO_MAXNODESTACK)
+							nodestack[nodestackpos++] = node->children[0];
+						nodestack[nodestackpos++] = node->children[1];
+					}
+					else
+					{
+						if (nodestackpos < GETLIGHTINFO_MAXNODESTACK)
+							nodestack[nodestackpos++] = node->children[1];
+						nodestack[nodestackpos++] = node->children[0];
+					}
+					break;
+				}
 			}
 		}
 		else
 		{
-			sides = BoxOnPlaneSide(info->lightmins, info->lightmaxs, plane);
-			if (sides == 3)
+			// leaf
+			leaf = (mleaf_t *)node;
+#if 1
+			if (r_shadow_frontsidecasting.integer && info->pvs != NULL && !CHECKPVSBIT(info->pvs, leaf->clusterindex))
+				continue;
+#endif
+#if 1
+			if (!BoxesOverlap(info->lightmins, info->lightmaxs, leaf->mins, leaf->maxs))
+				continue;
+#endif
+#if 1
+			if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes))
+				continue;
+#endif
+
+			if (svbspactive)
 			{
-				// recurse front side first because the svbsp building prefers it
-				if (PlaneDist(info->relativelightorigin, plane) >= 0)
+				// we can occlusion test the leaf by checking if all of its portals
+				// are occluded (unless the light is in this leaf - but that was
+				// already handled by the caller)
+				for (portal = leaf->portals;portal;portal = portal->next)
 				{
-					R_Q1BSP_RecursiveGetLightInfo(info, node->children[0]);
-					node = node->children[1];
+					for (i = 0;i < portal->numpoints;i++)
+						VectorCopy(portal->points[i].position, points[i]);
+					if (SVBSP_AddPolygon(&r_svbsp, portal->numpoints, points[0], false, NULL, NULL, 0) & 2)
+						break;
 				}
-				else
+				if (leaf->portals && portal == NULL)
+					continue; // no portals of this leaf visible
+			}
+
+			// add this leaf to the reduced light bounds
+			info->outmins[0] = min(info->outmins[0], leaf->mins[0]);
+			info->outmins[1] = min(info->outmins[1], leaf->mins[1]);
+			info->outmins[2] = min(info->outmins[2], leaf->mins[2]);
+			info->outmaxs[0] = max(info->outmaxs[0], leaf->maxs[0]);
+			info->outmaxs[1] = max(info->outmaxs[1], leaf->maxs[1]);
+			info->outmaxs[2] = max(info->outmaxs[2], leaf->maxs[2]);
+
+			// mark this leaf as being visible to the light
+			if (info->outleafpvs)
+			{
+				int leafindex = leaf - info->model->brush.data_leafs;
+				if (!CHECKPVSBIT(info->outleafpvs, leafindex))
 				{
-					R_Q1BSP_RecursiveGetLightInfo(info, node->children[1]);
-					node = node->children[0];
+					SETPVSBIT(info->outleafpvs, leafindex);
+					info->outleaflist[info->outnumleafs++] = leafindex;
 				}
 			}
-			else if (sides == 0)
-				return; // ERROR: NAN bounding box!
-			else
-				node = node->children[sides - 1];
-		}
-	}
-	if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, info->numfrustumplanes, info->frustumplanes))
-		return;
-	leaf = (mleaf_t *)node;
-	if (info->svbsp_active)
-	{
-		int i;
-		mportal_t *portal;
-		static double points[128][3];
-		for (portal = leaf->portals;portal;portal = portal->next)
-		{
-			for (i = 0;i < portal->numpoints;i++)
-				VectorCopy(portal->points[i].position, points[i]);
-			if (SVBSP_AddPolygon(&r_svbsp, portal->numpoints, points[0], false, NULL, NULL, 0) & 2)
-				break;
-		}
-		if (portal == NULL)
-			return; // no portals of this leaf visible
-	}
-	else
-	{
-		if (r_shadow_frontsidecasting.integer && info->pvs != NULL && !CHECKPVSBIT(info->pvs, leaf->clusterindex))
-			return;
-	}
-	// inserting occluders does not alter the leaf info
-	if (!info->svbsp_insertoccluder)
-	{
-		info->outmins[0] = min(info->outmins[0], leaf->mins[0]);
-		info->outmins[1] = min(info->outmins[1], leaf->mins[1]);
-		info->outmins[2] = min(info->outmins[2], leaf->mins[2]);
-		info->outmaxs[0] = max(info->outmaxs[0], leaf->maxs[0]);
-		info->outmaxs[1] = max(info->outmaxs[1], leaf->maxs[1]);
-		info->outmaxs[2] = max(info->outmaxs[2], leaf->maxs[2]);
-		if (info->outleafpvs)
-		{
-			int leafindex = leaf - info->model->brush.data_leafs;
-			if (!CHECKPVSBIT(info->outleafpvs, leafindex))
+
+			// when using BIH, we skip the surfaces here
+			if (skipsurfaces)
+				continue;
+
+			// iterate the surfaces linked by this leaf and check their triangles
+			leafsurfaceindices = leaf->firstleafsurface;
+			numleafsurfaces = leaf->numleafsurfaces;
+			if (svbspinsertoccluder)
 			{
-				SETPVSBIT(info->outleafpvs, leafindex);
-				info->outleaflist[info->outnumleafs++] = leafindex;
+				for (leafsurfaceindex = 0;leafsurfaceindex < numleafsurfaces;leafsurfaceindex++)
+				{
+					surfaceindex = leafsurfaceindices[leafsurfaceindex];
+					if (CHECKPVSBIT(info->outsurfacepvs, surfaceindex))
+						continue;
+					SETPVSBIT(info->outsurfacepvs, surfaceindex);
+					surface = surfaces + surfaceindex;
+					if (!BoxesOverlap(info->lightmins, info->lightmaxs, surface->mins, surface->maxs))
+						continue;
+					currentmaterialflags = R_GetCurrentTexture(surface->texture)->currentmaterialflags;
+					castshadow = !(currentmaterialflags & MATERIALFLAG_NOSHADOW);
+					if (!castshadow)
+						continue;
+					insidebox = BoxInsideBox(surface->mins, surface->maxs, info->lightmins, info->lightmaxs);
+					for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = info->model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->num_triangles;triangleindex++, t++, e += 3)
+					{
+						v[0] = info->model->brush.shadowmesh->vertex3f + e[0] * 3;
+						v[1] = info->model->brush.shadowmesh->vertex3f + e[1] * 3;
+						v[2] = info->model->brush.shadowmesh->vertex3f + e[2] * 3;
+						VectorCopy(v[0], v2[0]);
+						VectorCopy(v[1], v2[1]);
+						VectorCopy(v[2], v2[2]);
+						if (insidebox || TriangleOverlapsBox(v2[0], v2[1], v2[2], info->lightmins, info->lightmaxs))
+							SVBSP_AddPolygon(&r_svbsp, 3, v2[0], true, NULL, NULL, 0);
+					}
+				}
 			}
-		}
-	}
-	if (info->outsurfacepvs)
-	{
-		int leafsurfaceindex;
-		int surfaceindex;
-		int triangleindex, t;
-		int currentmaterialflags;
-		msurface_t *surface;
-		const int *e;
-		const vec_t *v[3];
-		double v2[3][3];
-		for (leafsurfaceindex = 0;leafsurfaceindex < leaf->numleafsurfaces;leafsurfaceindex++)
-		{
-			surfaceindex = leaf->firstleafsurface[leafsurfaceindex];
-			if (!CHECKPVSBIT(info->outsurfacepvs, surfaceindex))
+			else
 			{
-				surface = info->model->data_surfaces + surfaceindex;
-				currentmaterialflags = R_GetCurrentTexture(surface->texture)->currentmaterialflags;
-				if (BoxesOverlap(info->lightmins, info->lightmaxs, surface->mins, surface->maxs)
-				 && (!info->svbsp_insertoccluder || !(currentmaterialflags & MATERIALFLAG_NOSHADOW)))
+				for (leafsurfaceindex = 0;leafsurfaceindex < numleafsurfaces;leafsurfaceindex++)
 				{
-					qboolean addedtris = false;
-					qboolean insidebox = BoxInsideBox(surface->mins, surface->maxs, info->lightmins, info->lightmaxs);
+					surfaceindex = leafsurfaceindices[leafsurfaceindex];
+					if (CHECKPVSBIT(info->outsurfacepvs, surfaceindex))
+						continue;
+					SETPVSBIT(info->outsurfacepvs, surfaceindex);
+					surface = surfaces + surfaceindex;
+					if (!BoxesOverlap(info->lightmins, info->lightmaxs, surface->mins, surface->maxs))
+						continue;
+					addedtris = false;
+					currentmaterialflags = R_GetCurrentTexture(surface->texture)->currentmaterialflags;
+					castshadow = !(currentmaterialflags & MATERIALFLAG_NOSHADOW);
+					insidebox = BoxInsideBox(surface->mins, surface->maxs, info->lightmins, info->lightmaxs);
 					for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = info->model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->num_triangles;triangleindex++, t++, e += 3)
 					{
 						v[0] = info->model->brush.shadowmesh->vertex3f + e[0] * 3;
 						v[1] = info->model->brush.shadowmesh->vertex3f + e[1] * 3;
 						v[2] = info->model->brush.shadowmesh->vertex3f + e[2] * 3;
-						if (insidebox || TriangleOverlapsBox(v[0], v[1], v[2], info->lightmins, info->lightmaxs))
+						VectorCopy(v[0], v2[0]);
+						VectorCopy(v[1], v2[1]);
+						VectorCopy(v[2], v2[2]);
+						if (!insidebox && !TriangleOverlapsBox(v2[0], v2[1], v2[2], info->lightmins, info->lightmaxs))
+							continue;
+						if (svbspactive && !(SVBSP_AddPolygon(&r_svbsp, 3, v2[0], false, NULL, NULL, 0) & 2))
+							continue;
+						// we don't omit triangles from lighting even if they are
+						// backfacing, because when using shadowmapping they are often
+						// not fully occluded on the horizon of an edge
+						SETPVSBIT(info->outlighttrispvs, t);
+						addedtris = true;
+						if (castshadow)
 						{
-							if (info->svbsp_insertoccluder)
+							if (currentmaterialflags & MATERIALFLAG_NOCULLFACE)
 							{
-								if (!(currentmaterialflags & MATERIALFLAG_NOCULLFACE) && r_shadow_frontsidecasting.integer != PointInfrontOfTriangle(info->relativelightorigin, v[0], v[1], v[2]))
-									continue;
-								if (currentmaterialflags & MATERIALFLAG_NOSHADOW)
-									continue;
-								VectorCopy(v[0], v2[0]);
-								VectorCopy(v[1], v2[1]);
-								VectorCopy(v[2], v2[2]);
-								if (!(SVBSP_AddPolygon(&r_svbsp, 3, v2[0], true, NULL, NULL, 0) & 2))
-									continue;
-								addedtris = true;
+								// if the material is double sided we
+								// can't cull by direction
+								SETPVSBIT(info->outshadowtrispvs, t);
+							}
+							else if (frontsidecasting)
+							{
+								// front side casting occludes backfaces,
+								// so they are completely useless as both
+								// casters and lit polygons
+								if (PointInfrontOfTriangle(info->relativelightorigin, v2[0], v2[1], v2[2]))
+									SETPVSBIT(info->outshadowtrispvs, t);
 							}
 							else
 							{
-								if (info->svbsp_active)
-								{
-									VectorCopy(v[0], v2[0]);
-									VectorCopy(v[1], v2[1]);
-									VectorCopy(v[2], v2[2]);
-									if (!(SVBSP_AddPolygon(&r_svbsp, 3, v2[0], false, NULL, NULL, 0) & 2))
-										continue;
-								}
-								if (currentmaterialflags & MATERIALFLAG_NOCULLFACE)
-								{
-									// if the material is double sided we
-									// can't cull by direction
-									SETPVSBIT(info->outlighttrispvs, t);
-									addedtris = true;
-									if (!(currentmaterialflags & MATERIALFLAG_NOSHADOW))
-										SETPVSBIT(info->outshadowtrispvs, t);
-								}
-								else if (r_shadow_frontsidecasting.integer)
-								{
-									// front side casting occludes backfaces,
-									// so they are completely useless as both
-									// casters and lit polygons
-									if (!PointInfrontOfTriangle(info->relativelightorigin, v[0], v[1], v[2]))
-										continue;
-									SETPVSBIT(info->outlighttrispvs, t);
-									addedtris = true;
-									if (!(currentmaterialflags & MATERIALFLAG_NOSHADOW))
-										SETPVSBIT(info->outshadowtrispvs, t);
-								}
-								else
-								{
-									// back side casting does not occlude
-									// anything so we can't cull lit polygons
-									SETPVSBIT(info->outlighttrispvs, t);
-									addedtris = true;
-									if (!PointInfrontOfTriangle(info->relativelightorigin, v[0], v[1], v[2]) && !(currentmaterialflags & MATERIALFLAG_NOSHADOW))
-										SETPVSBIT(info->outshadowtrispvs, t);
-								}
+								// back side casting does not occlude
+								// anything so we can't cull lit polygons
+								if (!PointInfrontOfTriangle(info->relativelightorigin, v2[0], v2[1], v2[2]))
+									SETPVSBIT(info->outshadowtrispvs, t);
 							}
 						}
 					}
 					if (addedtris)
-					{
-						SETPVSBIT(info->outsurfacepvs, surfaceindex);
 						info->outsurfacelist[info->outnumsurfaces++] = surfaceindex;
+				}
+			}
+		}
+	}
+}
+
+static void R_Q1BSP_RecursiveGetLightInfo_BIH(r_q1bsp_getlightinfo_t *info, const bih_t *bih)
+{
+	bih_leaf_t *leaf;
+	bih_node_t *node;
+	int nodenum;
+	int axis;
+	int surfaceindex;
+	int t;
+	int nodeleafindex;
+	int currentmaterialflags;
+	qboolean castshadow;
+	msurface_t *surface;
+	const int *e;
+	const vec_t *v[3];
+	float v2[3][3];
+	int nodestack[GETLIGHTINFO_MAXNODESTACK];
+	int nodestackpos = 0;
+	// note: because the BSP leafs are not in the BIH tree, the _BSP function
+	// must be called to mark leafs visible for entity culling...
+	// we start at the root node
+	nodestack[nodestackpos++] = bih->rootnode;
+	// we'll be done when the stack is empty
+	while (nodestackpos)
+	{
+		// pop one off the stack to process
+		nodenum = nodestack[--nodestackpos];
+		// node
+		node = bih->nodes + nodenum;
+		if (node->type == BIH_UNORDERED)
+		{
+			for (nodeleafindex = 0;nodeleafindex < BIH_MAXUNORDEREDCHILDREN && node->children[nodeleafindex] >= 0;nodeleafindex++)
+			{
+				leaf = bih->leafs + node->children[nodeleafindex];
+				if (leaf->type != BIH_RENDERTRIANGLE)
+					continue;
+#if 1
+				if (!BoxesOverlap(info->lightmins, info->lightmaxs, leaf->mins, leaf->maxs))
+					continue;
+#endif
+#if 1
+				if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes))
+					continue;
+#endif
+				surfaceindex = leaf->surfaceindex;
+				surface = info->model->data_surfaces + surfaceindex;
+				currentmaterialflags = R_GetCurrentTexture(surface->texture)->currentmaterialflags;
+				castshadow = !(currentmaterialflags & MATERIALFLAG_NOSHADOW);
+				t = leaf->itemindex + surface->num_firstshadowmeshtriangle - surface->num_firsttriangle;
+				e = info->model->brush.shadowmesh->element3i + t * 3;
+				v[0] = info->model->brush.shadowmesh->vertex3f + e[0] * 3;
+				v[1] = info->model->brush.shadowmesh->vertex3f + e[1] * 3;
+				v[2] = info->model->brush.shadowmesh->vertex3f + e[2] * 3;
+				VectorCopy(v[0], v2[0]);
+				VectorCopy(v[1], v2[1]);
+				VectorCopy(v[2], v2[2]);
+				if (info->svbsp_insertoccluder)
+				{
+					if (castshadow)
+						SVBSP_AddPolygon(&r_svbsp, 3, v2[0], true, NULL, NULL, 0);
+					continue;
+				}
+				if (info->svbsp_active && !(SVBSP_AddPolygon(&r_svbsp, 3, v2[0], false, NULL, NULL, 0) & 2))
+					continue;
+				// we don't occlude triangles from lighting even
+				// if they are backfacing, because when using
+				// shadowmapping they are often not fully occluded
+				// on the horizon of an edge
+				SETPVSBIT(info->outlighttrispvs, t);
+				if (castshadow)
+				{
+					if (currentmaterialflags & MATERIALFLAG_NOCULLFACE)
+					{
+						// if the material is double sided we
+						// can't cull by direction
+						SETPVSBIT(info->outshadowtrispvs, t);
+					}
+					else if (r_shadow_frontsidecasting.integer)
+					{
+						// front side casting occludes backfaces,
+						// so they are completely useless as both
+						// casters and lit polygons
+						if (PointInfrontOfTriangle(info->relativelightorigin, v2[0], v2[1], v2[2]))
+							SETPVSBIT(info->outshadowtrispvs, t);
+					}
+					else
+					{
+						// back side casting does not occlude
+						// anything so we can't cull lit polygons
+						if (!PointInfrontOfTriangle(info->relativelightorigin, v2[0], v2[1], v2[2]))
+							SETPVSBIT(info->outshadowtrispvs, t);
 					}
 				}
+				if (!CHECKPVSBIT(info->outsurfacepvs, surfaceindex))
+				{
+					SETPVSBIT(info->outsurfacepvs, surfaceindex);
+					info->outsurfacelist[info->outnumsurfaces++] = surfaceindex;
+				}
 			}
 		}
+		else
+		{
+			axis = node->type - BIH_SPLITX;
+#if 0
+			if (!BoxesOverlap(info->lightmins, info->lightmaxs, node->mins, node->maxs))
+				continue;
+#endif
+#if 0
+			if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes))
+				continue;
+#endif
+			if (info->lightmins[axis] <= node->backmax)
+			{
+				if (info->lightmaxs[axis] >= node->frontmin && nodestackpos < GETLIGHTINFO_MAXNODESTACK)
+					nodestack[nodestackpos++] = node->front;
+				nodestack[nodestackpos++] = node->back;
+				continue;
+			}
+			else if (info->lightmaxs[axis] >= node->frontmin)
+			{
+				nodestack[nodestackpos++] = node->front;
+				continue;
+			}
+			else
+				continue; // light falls between children, nothing here
+		}
 	}
 }
 
 static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qboolean use_svbsp)
 {
+	extern cvar_t r_shadow_usebihculling;
 	if (use_svbsp)
 	{
-		double origin[3];
+		float origin[3];
 		VectorCopy(info->relativelightorigin, origin);
-		if (!r_svbsp.nodes)
-		{
-			r_svbsp.maxnodes = max(r_svbsp.maxnodes, 1<<18);
-			r_svbsp.nodes = (svbsp_node_t*) Mem_Alloc(r_main_mempool, r_svbsp.maxnodes * sizeof(svbsp_node_t));
-		}
+		r_svbsp.maxnodes = max(r_svbsp.maxnodes, 1<<12);
+		r_svbsp.nodes = (svbsp_node_t*) R_FrameData_Alloc(r_svbsp.maxnodes * sizeof(svbsp_node_t));
 		info->svbsp_active = true;
 		info->svbsp_insertoccluder = true;
 		for (;;)
 		{
 			SVBSP_Init(&r_svbsp, origin, r_svbsp.maxnodes, r_svbsp.nodes);
-			R_Q1BSP_RecursiveGetLightInfo(info, info->model->brush.data_nodes);
+			R_Q1BSP_RecursiveGetLightInfo_BSP(info, false);
 			// if that failed, retry with more nodes
 			if (r_svbsp.ranoutofnodes)
 			{
 				// an upper limit is imposed
 				if (r_svbsp.maxnodes >= 2<<22)
 					break;
-				Mem_Free(r_svbsp.nodes);
 				r_svbsp.maxnodes *= 2;
-				r_svbsp.nodes = (svbsp_node_t*) Mem_Alloc(tempmempool, r_svbsp.maxnodes * sizeof(svbsp_node_t));
+				r_svbsp.nodes = (svbsp_node_t*) R_FrameData_Alloc(r_svbsp.maxnodes * sizeof(svbsp_node_t));
+				//Mem_Free(r_svbsp.nodes);
+				//r_svbsp.nodes = (svbsp_node_t*) Mem_Alloc(tempmempool, r_svbsp.maxnodes * sizeof(svbsp_node_t));
 			}
 			else
 				break;
 		}
-		// now clear the surfacepvs array because we need to redo it
-		memset(info->outsurfacepvs, 0, (info->model->nummodelsurfaces + 7) >> 3);
+		// now clear the visibility arrays because we need to redo it
+		info->outnumleafs = 0;
 		info->outnumsurfaces = 0;
+		memset(info->outleafpvs, 0, (info->model->brush.num_leafs + 7) >> 3);
+		memset(info->outsurfacepvs, 0, (info->model->nummodelsurfaces + 7) >> 3);
+		if (info->model->brush.shadowmesh)
+			memset(info->outshadowtrispvs, 0, (info->model->brush.shadowmesh->numtriangles + 7) >> 3);
+		else
+			memset(info->outshadowtrispvs, 0, (info->model->surfmesh.num_triangles + 7) >> 3);
+		memset(info->outlighttrispvs, 0, (info->model->surfmesh.num_triangles + 7) >> 3);
 	}
 	else
 		info->svbsp_active = false;
@@ -919,15 +1160,41 @@ static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qboo
 	}
 
 	info->svbsp_insertoccluder = false;
-	R_Q1BSP_RecursiveGetLightInfo(info, info->model->brush.data_nodes);
-	if (developer.integer >= 100 && use_svbsp)
+	// use BIH culling on single leaf maps (generally this only happens if running a model as a map), otherwise use BSP culling to make use of vis data
+	if (r_shadow_usebihculling.integer > 0 && (r_shadow_usebihculling.integer == 2 || info->model->brush.num_leafs == 1) && info->model->render_bih.leafs != NULL)
+	{
+		R_Q1BSP_RecursiveGetLightInfo_BSP(info, true);
+		R_Q1BSP_RecursiveGetLightInfo_BIH(info, &info->model->render_bih);
+	}
+	else
+		R_Q1BSP_RecursiveGetLightInfo_BSP(info, false);
+	// we're using temporary framedata memory, so this pointer will be invalid soon, clear it
+	r_svbsp.nodes = NULL;
+	if (developer_extra.integer && use_svbsp)
 	{
-		Con_Printf("GetLightInfo: svbsp built with %i nodes, polygon stats:\n", r_svbsp.numnodes);
-		Con_Printf("occluders: %i accepted, %i rejected, %i fragments accepted, %i fragments rejected.\n", r_svbsp.stat_occluders_accepted, r_svbsp.stat_occluders_rejected, r_svbsp.stat_occluders_fragments_accepted, r_svbsp.stat_occluders_fragments_rejected);
-		Con_Printf("queries  : %i accepted, %i rejected, %i fragments accepted, %i fragments rejected.\n", r_svbsp.stat_queries_accepted, r_svbsp.stat_queries_rejected, r_svbsp.stat_queries_fragments_accepted, r_svbsp.stat_queries_fragments_rejected);
+		Con_DPrintf("GetLightInfo: svbsp built with %i nodes, polygon stats:\n", r_svbsp.numnodes);
+		Con_DPrintf("occluders: %i accepted, %i rejected, %i fragments accepted, %i fragments rejected.\n", r_svbsp.stat_occluders_accepted, r_svbsp.stat_occluders_rejected, r_svbsp.stat_occluders_fragments_accepted, r_svbsp.stat_occluders_fragments_rejected);
+		Con_DPrintf("queries  : %i accepted, %i rejected, %i fragments accepted, %i fragments rejected.\n", r_svbsp.stat_queries_accepted, r_svbsp.stat_queries_rejected, r_svbsp.stat_queries_fragments_accepted, r_svbsp.stat_queries_fragments_rejected);
 	}
 }
 
+static msurface_t *r_q1bsp_getlightinfo_surfaces;
+
+int R_Q1BSP_GetLightInfo_comparefunc(const void *ap, const void *bp)
+{
+	int a = *(int*)ap;
+	int b = *(int*)bp;
+	const msurface_t *as = r_q1bsp_getlightinfo_surfaces + a;
+	const msurface_t *bs = r_q1bsp_getlightinfo_surfaces + b;
+	if (as->texture < bs->texture)
+		return -1;
+	if (as->texture > bs->texture)
+		return 1;
+	return a - b;
+}
+
+extern cvar_t r_shadow_sortsurfaces;
+
 void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs, unsigned char *visitingleafpvs, int numfrustumplanes, const mplane_t *frustumplanes)
 {
 	r_q1bsp_getlightinfo_t info;
@@ -1006,6 +1273,11 @@ void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa
 
 	*outnumleafspointer = info.outnumleafs;
 	*outnumsurfacespointer = info.outnumsurfaces;
+
+	// now sort surfaces by texture for faster rendering
+	r_q1bsp_getlightinfo_surfaces = info.model->data_surfaces;
+	if (r_shadow_sortsurfaces.integer)
+		qsort(info.outsurfacelist, info.outnumsurfaces, sizeof(*info.outsurfacelist), R_Q1BSP_GetLightInfo_comparefunc);
 }
 
 void R_Q1BSP_CompileShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
@@ -1014,6 +1286,9 @@ void R_Q1BSP_CompileShadowVolume(entity_render_t *ent, vec3_t relativelightorigi
 	msurface_t *surface;
 	int surfacelistindex;
 	float projectdistance = relativelightdirection ? lightradius : lightradius + model->radius*2 + r_shadow_projectdistance.value;
+	// if triangle neighbors are disabled, shadowvolumes are disabled
+	if (!model->brush.shadowmesh->neighbor3i)
+		return;
 	r_shadow_compilingrtlight->static_meshchain_shadow_zfail = Mod_ShadowMesh_Begin(r_main_mempool, 32768, 32768, NULL, NULL, NULL, false, false, true);
 	R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
 	for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
@@ -1038,10 +1313,14 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, const vec3_t relativelightor
 	// check the box in modelspace, it was already checked in worldspace
 	if (!BoxesOverlap(model->normalmins, model->normalmaxs, lightmins, lightmaxs))
 		return;
+	R_FrameData_SetMark();
 	if (ent->model->brush.submodel)
 		GL_PolygonOffset(r_refdef.shadowpolygonfactor + r_polygonoffset_submodel_factor.value, r_refdef.shadowpolygonoffset + r_polygonoffset_submodel_offset.value);
 	if (model->brush.shadowmesh)
 	{
+		// if triangle neighbors are disabled, shadowvolumes are disabled
+		if (!model->brush.shadowmesh->neighbor3i)
+			return;
 		R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
 		for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
 		{
@@ -1054,6 +1333,9 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, const vec3_t relativelightor
 	}
 	else
 	{
+		// if triangle neighbors are disabled, shadowvolumes are disabled
+		if (!model->surfmesh.data_neighbor3i)
+			return;
 		projectdistance = lightradius + model->radius*2;
 		R_Shadow_PrepareShadowMark(model->surfmesh.num_triangles);
 		// identify lit faces within the bounding box
@@ -1063,13 +1345,13 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, const vec3_t relativelightor
 			rsurface.texture = R_GetCurrentTexture(surface->texture);
 			if (rsurface.texture->currentmaterialflags & MATERIALFLAG_NOSHADOW)
 				continue;
-			RSurf_PrepareVerticesForBatch(false, false, 1, &surface);
-			R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface.vertex3f, rsurface.modelelement3i, relativelightorigin, relativelightdirection, lightmins, lightmaxs, surface->mins, surface->maxs);
+			R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface.modelvertex3f, rsurface.modelelement3i, relativelightorigin, relativelightdirection, lightmins, lightmaxs, surface->mins, surface->maxs);
 		}
-		R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface.vertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, relativelightdirection, projectdistance, numshadowmark, shadowmarklist, ent->mins, ent->maxs);
+		R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface.modelvertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, relativelightdirection, projectdistance, numshadowmark, shadowmarklist, ent->mins, ent->maxs);
 	}
 	if (ent->model->brush.submodel)
 		GL_PolygonOffset(r_refdef.shadowpolygonfactor, r_refdef.shadowpolygonoffset);
+	R_FrameData_ReturnToMark();
 }
 
 void R_Q1BSP_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
@@ -1079,6 +1361,8 @@ void R_Q1BSP_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin,
 	int surfacelistindex;
 	int sidetotals[6] = { 0, 0, 0, 0, 0, 0 }, sidemasks = 0;
 	int i;
+	if (!model->brush.shadowmesh)
+		return;
 	r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Begin(r_main_mempool, 32768, 32768, NULL, NULL, NULL, false, false, true);
 	R_Shadow_PrepareShadowSides(model->brush.shadowmesh->numtriangles);
 	for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
@@ -1094,14 +1378,19 @@ void R_Q1BSP_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin,
 			r_shadow_compilingrtlight->static_shadowmap_casters &= ~(1 << i);
 }
 
+#define RSURF_MAX_BATCHSURFACES 8192
+
+static const msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES];
+
 void R_Q1BSP_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const unsigned char *surfacesides, const vec3_t lightmins, const vec3_t lightmaxs)
 {
 	dp_model_t *model = ent->model;
-	const msurface_t *surface, *batch[1024];
-	int modelsurfacelistindex, batchsize;
+	const msurface_t *surface;
+	int modelsurfacelistindex, batchnumsurfaces;
 	// check the box in modelspace, it was already checked in worldspace
 	if (!BoxesOverlap(model->normalmins, model->normalmaxs, lightmins, lightmaxs))
 		return;
+	R_FrameData_SetMark();
 	// identify lit faces within the bounding box
 	for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
 	{
@@ -1115,27 +1404,31 @@ void R_Q1BSP_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relative
 			continue;
 		r_refdef.stats.lights_dynamicshadowtriangles += surface->num_triangles;
 		r_refdef.stats.lights_shadowtriangles += surface->num_triangles;
-		batch[0] = surface;
-		batchsize = 1;
-		while(++modelsurfacelistindex < modelnumsurfaces && batchsize < (int)(sizeof(batch)/sizeof(batch[0])))
+		batchsurfacelist[0] = surface;
+		batchnumsurfaces = 1;
+		while(++modelsurfacelistindex < modelnumsurfaces && batchnumsurfaces < RSURF_MAX_BATCHSURFACES)
 		{
 			surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
 			if (surfacesides && !(surfacesides[modelsurfacelistindex] & (1 << side)))
 				continue;
-			if (surface->texture != batch[0]->texture)
+			if (surface->texture != batchsurfacelist[0]->texture)
 				break;
 			if (!BoxesOverlap(lightmins, lightmaxs, surface->mins, surface->maxs))
 				continue;
 			r_refdef.stats.lights_dynamicshadowtriangles += surface->num_triangles;
 			r_refdef.stats.lights_shadowtriangles += surface->num_triangles;
-			batch[batchsize++] = surface;
+			batchsurfacelist[batchnumsurfaces++] = surface;
 		}
 		--modelsurfacelistindex;
 		GL_CullFace(rsurface.texture->currentmaterialflags & MATERIALFLAG_NOCULLFACE ? GL_NONE : r_refdef.view.cullface_back);
-		RSurf_PrepareVerticesForBatch(false, false, batchsize, batch);
-		RSurf_DrawBatch_Simple(batchsize, batch);
-		GL_LockArrays(0, 0);
+		RSurf_PrepareVerticesForBatch(BATCHNEED_ARRAY_VERTEX, batchnumsurfaces, batchsurfacelist);
+		if (rsurface.batchvertex3fbuffer)
+			R_Mesh_PrepareVertices_Vertex3f(rsurface.batchnumvertices, rsurface.batchvertex3f, rsurface.batchvertex3fbuffer);
+		else
+			R_Mesh_PrepareVertices_Vertex3f(rsurface.batchnumvertices, rsurface.batchvertex3f, rsurface.batchvertex3f_vertexbuffer);
+		RSurf_DrawBatch();
 	}
+	R_FrameData_ReturnToMark();
 }
 
 #define BATCHSIZE 1024
@@ -1145,7 +1438,8 @@ static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, co
 	int i, j, endsurface;
 	texture_t *t;
 	const msurface_t *surface;
-	// note: in practice this never actually receives batches), oh well
+	R_FrameData_SetMark();
+	// note: in practice this never actually receives batches
 	R_Shadow_RenderMode_Begin();
 	R_Shadow_RenderMode_ActiveLight(rtlight);
 	R_Shadow_RenderMode_Lighting(false, true, false);
@@ -1162,29 +1456,23 @@ static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, co
 			surface = rsurface.modelsurfaces + surfacelist[j];
 			if (t != surface->texture)
 				break;
-			RSurf_PrepareVerticesForBatch(true, true, 1, &surface);
-			R_Shadow_RenderLighting(surface->num_firstvertex, surface->num_vertices, surface->num_firsttriangle, surface->num_triangles, ent->model->surfmesh.data_element3i, ent->model->surfmesh.data_element3s, ent->model->surfmesh.ebo3i, ent->model->surfmesh.ebo3s);
+			R_Shadow_RenderLighting(1, &surface);
 		}
 	}
 	R_Shadow_RenderMode_End();
+	R_FrameData_ReturnToMark();
 }
 
-#define RSURF_MAX_BATCHSURFACES 8192
-
 extern qboolean r_shadow_usingdeferredprepass;
-void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs)
+void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *lighttrispvs)
 {
 	dp_model_t *model = ent->model;
 	const msurface_t *surface;
-	int i, k, kend, l, m, mend, endsurface, batchnumsurfaces, batchnumtriangles, batchfirstvertex, batchlastvertex, batchfirsttriangle;
-	qboolean usebufferobject, culltriangles;
-	const int *element3i;
-	static msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES];
-	static int batchelements[BATCHSIZE*3];
+	int i, k, kend, l, endsurface, batchnumsurfaces, texturenumsurfaces;
+	const msurface_t **texturesurfacelist;
 	texture_t *tex;
 	CHECKGLERROR
-	culltriangles = r_shadow_culltriangles.integer && !(ent->flags & RENDER_NOSELFSHADOW);
-	element3i = rsurface.modelelement3i;
+	R_FrameData_SetMark();
 	// this is a double loop because non-visible surface skipping has to be
 	// fast, and even if this is not the world model (and hence no visibility
 	// checking) the input surface list and batch buffer are different formats
@@ -1215,9 +1503,10 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
 			for (kend = k;kend < batchnumsurfaces && tex == batchsurfacelist[kend]->texture;kend++)
 				;
 			// now figure out what to do with this particular range of surfaces
-			if (!(rsurface.texture->currentmaterialflags & MATERIALFLAG_WALL))
+			// VorteX: added MATERIALFLAG_NORTLIGHT
+			if ((rsurface.texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NORTLIGHT)) != MATERIALFLAG_WALL)
 				continue;
-			if (r_waterstate.renderingscene && (rsurface.texture->currentmaterialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION)))
+			if (r_fb.water.renderingscene && (rsurface.texture->currentmaterialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA)))
 				continue;
 			if (rsurface.texture->currentmaterialflags & MATERIALFLAGMASK_DEPTHSORTED)
 			{
@@ -1235,62 +1524,12 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
 			}
 			if (r_shadow_usingdeferredprepass)
 				continue;
-			batchnumtriangles = 0;
-			batchfirsttriangle = surface->num_firsttriangle;
-			m = 0; // hush warning
-			for (l = k;l < kend;l++)
-			{
-				surface = batchsurfacelist[l];
-				RSurf_PrepareVerticesForBatch(true, true, 1, &surface);
-				for (m = surface->num_firsttriangle, mend = m + surface->num_triangles;m < mend;m++)
-				{
-					if (trispvs)
-					{
-						if (!CHECKPVSBIT(trispvs, m))
-						{
-							usebufferobject = false;
-							continue;
-						}
-					}
-					else if (culltriangles)
-					{
-						if (r_shadow_frontsidecasting.integer && !PointInfrontOfTriangle(rsurface.entitylightorigin, rsurface.vertex3f + element3i[m*3+0]*3, rsurface.vertex3f + element3i[m*3+1]*3, rsurface.vertex3f + element3i[m*3+2]*3))
-						{
-							usebufferobject = false;
-							continue;
-						}
-					}
-					if (batchnumtriangles >= BATCHSIZE)
-					{
-						r_refdef.stats.lights_lighttriangles += batchnumtriangles;
-						Mod_VertexRangeFromElements(batchnumtriangles*3, batchelements, &batchfirstvertex, &batchlastvertex);
-						// use the element buffer if all triangles are consecutive
-						if (m == batchfirsttriangle + batchnumtriangles)
-							R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchfirsttriangle, batchnumtriangles, ent->model->surfmesh.data_element3i, ent->model->surfmesh.data_element3s, ent->model->surfmesh.ebo3i, ent->model->surfmesh.ebo3s);
-						else
-							R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, 0, batchnumtriangles, batchelements, NULL, 0, 0);
-						usebufferobject = true;
-						batchnumtriangles = 0;
-						batchfirsttriangle = m;
-					}
-					batchelements[batchnumtriangles*3+0] = element3i[m*3+0];
-					batchelements[batchnumtriangles*3+1] = element3i[m*3+1];
-					batchelements[batchnumtriangles*3+2] = element3i[m*3+2];
-					batchnumtriangles++;
-				}
-			}
-			if (batchnumtriangles > 0)
-			{
-				r_refdef.stats.lights_lighttriangles += batchnumtriangles;
-				Mod_VertexRangeFromElements(batchnumtriangles*3, batchelements, &batchfirstvertex, &batchlastvertex);
-				// use the element buffer if all triangles are consecutive
-				if (m == batchfirsttriangle + batchnumtriangles)
-					R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchfirsttriangle, batchnumtriangles, ent->model->surfmesh.data_element3i, ent->model->surfmesh.data_element3s, ent->model->surfmesh.ebo3i, ent->model->surfmesh.ebo3s);
-				else
-					R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, 0, batchnumtriangles, batchelements, NULL, 0, 0);
-			}
+			texturenumsurfaces = kend - k;
+			texturesurfacelist = batchsurfacelist + k;
+			R_Shadow_RenderLighting(texturenumsurfaces, texturesurfacelist);
 		}
 	}
+	R_FrameData_ReturnToMark();
 }
 
 //Made by [515]
@@ -1303,8 +1542,7 @@ void R_ReplaceWorldTexture (void)
 	skinframe_t *skinframe;
 	if (!r_refdef.scene.worldmodel)
 	{
-		if (gamemode != GAME_BLOODOMNICIDE)
-			Con_Printf("There is no worldmodel\n");
+		Con_Printf("There is no worldmodel\n");
 		return;
 	}
 	m = r_refdef.scene.worldmodel;
@@ -1317,8 +1555,7 @@ void R_ReplaceWorldTexture (void)
 	}
 	if(!cl.islocalgame || !cl.worldmodel)
 	{
-		if (gamemode != GAME_BLOODOMNICIDE)
-			Con_Print("This command works only in singleplayer\n");
+		Con_Print("This command works only in singleplayer\n");
 		return;
 	}
 	r = Cmd_Argv(1);
@@ -1334,13 +1571,11 @@ void R_ReplaceWorldTexture (void)
 //				t->skinframes[0] = skinframe;
 				t->currentskinframe = skinframe;
 				t->currentskinframe = skinframe;
-				if (gamemode != GAME_BLOODOMNICIDE)
-					Con_Printf("%s replaced with %s\n", r, newt);
+				Con_Printf("%s replaced with %s\n", r, newt);
 			}
 			else
 			{
-				if (gamemode != GAME_BLOODOMNICIDE)
-					Con_Printf("%s was not found\n", newt);
+				Con_Printf("%s was not found\n", newt);
 				return;
 			}
 		}
@@ -1387,6 +1622,7 @@ void GL_Surf_Init(void)
 	Cvar_RegisterVariable(&r_lockpvs);
 	Cvar_RegisterVariable(&r_lockvisibility);
 	Cvar_RegisterVariable(&r_useportalculling);
+	Cvar_RegisterVariable(&r_usesurfaceculling);
 	Cvar_RegisterVariable(&r_q3bsp_renderskydepth);
 
 	Cmd_AddCommand ("r_replacemaptexture", R_ReplaceWorldTexture, "override a map texture for testing purposes");