X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_backend.c;h=3196022fec8e533497284b9db8621b35aa21f2c0;hp=55788e8934328995d468cdadcb5fc5ff6d0f5671;hb=c22ec98a144f18d7519eb4a06dd1ee8937e8c4ac;hpb=c8630f49b9fe6321ff9778ea79bd062d812e513d

diff --git a/gl_backend.c b/gl_backend.c
index 55788e89..3196022f 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -852,16 +852,6 @@ void R_Mesh_GetSpace(int numverts)
 		}
 	}
 
-/*
-#ifdef MESH_BATCH
-	if (gl_mesh_batching.integer)
-	{
-		if (gl_batchvertexcount == 0)
-			gl_batchvertexfirst = varray_offset;
-		gl_batchvertexcount += numverts;
-	}
-#endif
-*/
 	varray_vertex3f = varray_buf_vertex3f + varray_offset * 3;
 	varray_color4f = varray_buf_color4f + varray_offset * 4;
 	for (i = 0;i < backendunits;i++)
@@ -952,6 +942,54 @@ void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
 	}
 }
 
+// renders triangles using vertices from the most recent GetSpace call
+// (can be multiple Draw calls per GetSpace)
+void R_Mesh_Draw_NoBatching(int numverts, int numtriangles, const int *elements)
+{
+	int numelements = numtriangles * 3;
+	if (numtriangles == 0 || numverts == 0)
+	{
+		Con_Printf("R_Mesh_Draw_NoBatching(%d, %d, %08p);\n", numverts, numtriangles, elements);
+		return;
+	}
+	c_meshs++;
+	c_meshelements += numelements;
+	CHECKGLERROR
+	if (gl_state.pointervertexcount)
+	{
+		if (r_render.integer)
+		{
+			GL_LockArrays(0, gl_state.pointervertexcount);
+			if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+			{
+				qglDrawRangeElements(GL_TRIANGLES, 0, gl_state.pointervertexcount, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR
+			}
+			else
+			{
+				qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR
+			}
+			GL_LockArrays(0, 0);
+		}
+	}
+	else
+	{
+		GL_Backend_RenumberElements(varray_buf_elements3i, numelements, elements, varray_offset);
+		if (r_render.integer)
+		{
+			GL_LockArrays(varray_offset, numverts);
+			if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+			{
+				qglDrawRangeElements(GL_TRIANGLES, varray_offset, varray_offset + numverts, numelements, GL_UNSIGNED_INT, varray_buf_elements3i);CHECKGLERROR
+			}
+			else
+			{
+				qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, varray_buf_elements3i);CHECKGLERROR
+			}
+			GL_LockArrays(0, 0);
+		}
+	}
+}
+
 // restores backend state, used when done with 3D rendering
 void R_Mesh_Finish(void)
 {