From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 22 Jan 2011 22:14:29 +0000 (+0000)
Subject: removed numtexcoords parameter in DPSOFTRAST_Draw_LoadVertices
X-Git-Tag: xonotic-v0.5.0~438^2~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2693591ffd47c0bc0288329db0644e5a9c1c9f80;p=xonotic%2Fdarkplaces.git

removed numtexcoords parameter in DPSOFTRAST_Draw_LoadVertices


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

diff --git a/dpsoftrast.c b/dpsoftrast.c
index 1f757deb..d08de72a 100644
--- a/dpsoftrast.c
+++ b/dpsoftrast.c
@@ -934,7 +934,7 @@ void DPSOFTRAST_Uniform1iARB(DPSOFTRAST_UNIFORM index, int i0)
 	dpsoftrast.uniform1i[index] = i0;
 }
 
-void DPSOFTRAST_Draw_LoadVertices(int firstvertex, int numvertices, bool needcolors, int numtexcoords)
+void DPSOFTRAST_Draw_LoadVertices(int firstvertex, int numvertices, bool needcolors)
 {
 	int i;
 	int j;
@@ -1018,7 +1018,7 @@ void DPSOFTRAST_Draw_LoadVertices(int firstvertex, int numvertices, bool needcol
 			}
 		}
 	}
-	for (j = 0;j < numtexcoords;j++)
+	for (j = 0;j < DPSOFTRAST_ARRAY_TOTAL-2;j++)
 	{
 		if (dpsoftrast.pointer_texcoordf[j])
 		{
@@ -2419,7 +2419,7 @@ void DPSOFTRAST_DrawTriangles(int firstvertex, int numvertices, int numtriangles
 	arraymask[8] = dpsoftrast.pointer_texcoordf[6] != NULL;
 	arraymask[9] = dpsoftrast.pointer_texcoordf[7] != NULL;
 	DPSOFTRAST_Validate(DPSOFTRAST_VALIDATE_DRAW);
-	DPSOFTRAST_Draw_LoadVertices(firstvertex, numvertices, true, 1);
+	DPSOFTRAST_Draw_LoadVertices(firstvertex, numvertices, true);
 	DPSOFTRAST_Draw_VertexShader();
 	DPSOFTRAST_Draw_ProjectVertices(dpsoftrast.draw.screencoord4f, dpsoftrast.draw.post_array4f[DPSOFTRAST_ARRAY_POSITION], numvertices);
 	DPSOFTRAST_Draw_ProcessTriangles(firstvertex, numvertices, numtriangles, element3i, element3s, arraymask);