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 17dc8e5e489cb17a36cfff177e7724e6e78c038d..22edd22b34787bd7fc99412290670e5afc3d9a4c 100644 (file)
--- 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 1075039c1de6f0cd07ad1e4b7450c5bdfdc52838..947f4146890d8ae5daf80642c759f723407e0d27 100644 (file)
--- 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