From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 8 Jan 2013 11:19:58 +0000 (+0000)
Subject: flag a few more things (depth-only draws, shadowmap draws) as allowing
X-Git-Tag: xonotic-v0.7.0~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb0b44533e4e3845f8c82136a63ecb2e8166e893;p=xonotic%2Fdarkplaces.git

flag a few more things (depth-only draws, shadowmap draws) as allowing
r_batch_multidraw to work

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11872 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=21ea7ca9acc5e13e563d00d7e9cd9e13e4dc7382
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 17dc8e5e..22edd22b 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -10460,7 +10460,7 @@ static void R_DrawSurface_TransparentCallback(const entity_render_t *ent, const
 				R_SetupShader_DepthOrShadow(false, false);
 			}
 			RSurf_SetupDepthAndCulling();
-			RSurf_PrepareVerticesForBatch(BATCHNEED_ARRAY_VERTEX, texturenumsurfaces, texturesurfacelist);
+			RSurf_PrepareVerticesForBatch(BATCHNEED_ARRAY_VERTEX | BATCHNEED_ALLOWMULTIDRAW, texturenumsurfaces, texturesurfacelist);
 			if (rsurface.batchvertex3fbuffer)
 				R_Mesh_PrepareVertices_Vertex3f(rsurface.batchnumvertices, rsurface.batchvertex3f, rsurface.batchvertex3fbuffer);
 			else
@@ -10555,7 +10555,7 @@ static void R_DrawTextureSurfaceList_DepthOnly(int texturenumsurfaces, const msu
 	if (r_fb.water.renderingscene && (rsurface.texture->currentmaterialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFLECTION)))
 		return;
 	RSurf_SetupDepthAndCulling();
-	RSurf_PrepareVerticesForBatch(BATCHNEED_ARRAY_VERTEX, texturenumsurfaces, texturesurfacelist);
+	RSurf_PrepareVerticesForBatch(BATCHNEED_ARRAY_VERTEX | BATCHNEED_ALLOWMULTIDRAW, texturenumsurfaces, texturesurfacelist);
 	if (rsurface.batchvertex3fbuffer)
 		R_Mesh_PrepareVertices_Vertex3f(rsurface.batchnumvertices, rsurface.batchvertex3f, rsurface.batchvertex3fbuffer);
 	else
diff --git a/gl_rsurf.c b/gl_rsurf.c
index 1075039c..947f4146 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -1423,7 +1423,7 @@ void R_Q1BSP_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relative
 		}
 		--modelsurfacelistindex;
 		GL_CullFace(rsurface.texture->currentmaterialflags & MATERIALFLAG_NOCULLFACE ? GL_NONE : r_refdef.view.cullface_back);
-		RSurf_PrepareVerticesForBatch(BATCHNEED_ARRAY_VERTEX, batchnumsurfaces, batchsurfacelist);
+		RSurf_PrepareVerticesForBatch(BATCHNEED_ARRAY_VERTEX | BATCHNEED_ALLOWMULTIDRAW, batchnumsurfaces, batchsurfacelist);
 		if (rsurface.batchvertex3fbuffer)
 			R_Mesh_PrepareVertices_Vertex3f(rsurface.batchnumvertices, rsurface.batchvertex3f, rsurface.batchvertex3fbuffer);
 		else