From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 31 Jul 2002 14:04:06 +0000 (+0000)
Subject: cleaned up gl_mesh_drawmode related code, hopefully fixing various unknown bugs
X-Git-Tag: RELEASE_0_2_0_RC1~402
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c21ba48e547026f3e5a99dbe5c0b84f7c2c3ae45;p=xonotic%2Fdarkplaces.git

cleaned up gl_mesh_drawmode related code, hopefully fixing various unknown bugs


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

diff --git a/gl_backend.c b/gl_backend.c
index d6550030..a50dd7e4 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -230,12 +230,26 @@ static void gl_backend_bufferchanges(int init)
 		Cvar_SetValueQuick(&gl_mesh_maxtriangles, overflowedmeshtris);
 	overflowedmeshtris = 0;
 
-	if (gl_mesh_drawmode.integer == 3 && qglDrawRangeElements != NULL)
+	if (gl_mesh_drawmode.integer < 0)
+		Cvar_SetValueQuick(&gl_mesh_drawmode, 0);
+	if (gl_mesh_drawmode.integer > 3)
+		Cvar_SetValueQuick(&gl_mesh_drawmode, 3);
+
+	if (gl_mesh_drawmode.integer >= 3)
 	{
-		if (gl_mesh_maxtriangles.integer * 3 > gl_maxdrawrangeelementsindices)
-			Cvar_SetValueQuick(&gl_mesh_maxtriangles, (int) (gl_maxdrawrangeelementsindices / 3));
-		if (gl_mesh_maxtriangles.integer * 3 > gl_maxdrawrangeelementsvertices)
-			Cvar_SetValueQuick(&gl_mesh_maxtriangles, (int) (gl_maxdrawrangeelementsvertices / 3));
+		if (qglDrawRangeElements != NULL && gl_maxdrawrangeelementsindices >= 3072 && gl_maxdrawrangeelementsvertices >= 3072)
+		{
+			// make sure we don't exceed the DrawRangeElements limits
+			if (gl_mesh_maxtriangles.integer * 3 > gl_maxdrawrangeelementsindices)
+				Cvar_SetValueQuick(&gl_mesh_maxtriangles, (int) (gl_maxdrawrangeelementsindices / 3));
+			if (gl_mesh_maxtriangles.integer * 3 > gl_maxdrawrangeelementsvertices)
+				Cvar_SetValueQuick(&gl_mesh_maxtriangles, (int) (gl_maxdrawrangeelementsvertices / 3));
+		}
+		else
+		{
+			// change drawmode 3 to 2 if 3 won't work
+			Cvar_SetValueQuick(&gl_mesh_drawmode, 2);
+		}
 	}
 
 	// 21760 is (65536 / 3) rounded off to a multiple of 128
@@ -306,7 +320,7 @@ int arraylocked = false;
 
 void GL_LockArray(int first, int count)
 {
-	if (!arraylocked && gl_supportslockarrays && gl_lockarrays.integer && gl_mesh_drawmode.integer != 0)
+	if (!arraylocked && gl_supportslockarrays && gl_lockarrays.integer && gl_mesh_drawmode.integer > 0)
 	{
 		qglLockArraysEXT(first, count);
 		CHECKGLERROR
@@ -430,7 +444,7 @@ void GL_SetupTextureState(void)
 			{
 				qglDisable(GL_TEXTURE_2D);CHECKGLERROR
 			}
-			if (gl_mesh_drawmode.integer != 0)
+			if (gl_mesh_drawmode.integer > 0)
 			{
 				qglClientActiveTexture(GL_TEXTURE0_ARB + (mesh_clientunit = i));CHECKGLERROR
 				qglTexCoordPointer(2, GL_FLOAT, sizeof(buf_texcoord_t), buf_texcoord[i]);CHECKGLERROR
@@ -457,7 +471,7 @@ void GL_SetupTextureState(void)
 		{
 			qglDisable(GL_TEXTURE_2D);CHECKGLERROR
 		}
-		if (gl_mesh_drawmode.integer != 0)
+		if (gl_mesh_drawmode.integer > 0)
 		{
 			qglTexCoordPointer(2, GL_FLOAT, sizeof(buf_texcoord_t), buf_texcoord[0]);CHECKGLERROR
 			if (mesh_texture[0])
@@ -527,7 +541,7 @@ void R_Mesh_Start(void)
 	qglDepthMask(mesh_depthmask);CHECKGLERROR
 
 	usedarrays = false;
-	if (gl_mesh_drawmode.integer != 0)
+	if (gl_mesh_drawmode.integer > 0)
 	{
 		usedarrays = true;
 		qglVertexPointer(3, GL_FLOAT, sizeof(buf_vertex_t), &buf_vertex[0].v[0]);CHECKGLERROR
@@ -719,20 +733,17 @@ void GL_MeshState(buf_mesh_t *mesh)
 void GL_DrawRangeElements(int firstvert, int endvert, int indexcount, GLuint *index)
 {
 	unsigned int i, j, in;
-	if (gl_mesh_drawmode.integer == 3 && qglDrawRangeElements == NULL)
-		Cvar_SetValueQuick(&gl_mesh_drawmode, 2);
-
-	if (gl_mesh_drawmode.integer == 3)
+	if (gl_mesh_drawmode.integer >= 3)
 	{
 		// GL 1.2 or GL 1.1 with extension
 		qglDrawRangeElements(GL_TRIANGLES, firstvert, endvert, indexcount, GL_UNSIGNED_INT, index);
 	}
-	else if (gl_mesh_drawmode.integer == 2)
+	else if (gl_mesh_drawmode.integer >= 2)
 	{
 		// GL 1.1
 		qglDrawElements(GL_TRIANGLES, indexcount, GL_UNSIGNED_INT, index);
 	}
-	else if (gl_mesh_drawmode.integer == 1)
+	else if (gl_mesh_drawmode.integer >= 1)
 	{
 		// GL 1.1
 		// feed it manually using glArrayElement
@@ -745,8 +756,6 @@ void GL_DrawRangeElements(int firstvert, int endvert, int indexcount, GLuint *in
 	{
 		// GL 1.1 but not using vertex arrays - 3dfx glquake minigl driver
 		// feed it manually
-		if (gl_mesh_drawmode.integer != 0)
-			Cvar_SetValueQuick(&gl_mesh_drawmode, 0);
 		qglBegin(GL_TRIANGLES);
 		if (r_multitexture.integer)
 		{
@@ -804,7 +813,8 @@ void R_Mesh_Render(void)
 
 	GL_UpdateFarclip();
 
-	if (!gl_mesh_floatcolors.integer || gl_mesh_drawmode.integer == 0)
+	// drawmode 0 always uses byte colors
+	if (!gl_mesh_floatcolors.integer || gl_mesh_drawmode.integer <= 0)
 		GL_ConvertColorsFloatToByte();
 
 	if (gl_backend_rebindtextures)
diff --git a/gl_draw.c b/gl_draw.c
index 3e1e2187..a6b33236 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -550,6 +550,14 @@ void R_DrawQueue(void)
 			}
 			mesh = (void *)(dq + 1);
 			qglBindTexture(GL_TEXTURE_2D, R_GetTexture(mesh->texture));
+
+			if (gl_mesh_drawmode.integer < 0)
+				Cvar_SetValueQuick(&gl_mesh_drawmode, 0);
+			if (gl_mesh_drawmode.integer > 3)
+				Cvar_SetValueQuick(&gl_mesh_drawmode, 3);
+			if (gl_mesh_drawmode.integer >= 3 && (qglDrawRangeElements == NULL || gl_maxdrawrangeelementsindices < 3072 || gl_maxdrawrangeelementsvertices < 3072))
+				Cvar_SetValueQuick(&gl_mesh_drawmode, 2);
+
 			if (gl_mesh_drawmode.integer > 0)
 			{
 				qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), mesh->vertices);CHECKGLERROR
@@ -559,39 +567,41 @@ void R_DrawQueue(void)
 				qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
 				qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR
 			}
-			if (gl_mesh_drawmode.integer == 3 && qglDrawRangeElements == NULL)
-				Cvar_SetValueQuick(&gl_mesh_drawmode, 2);
 
-			if (gl_mesh_drawmode.integer == 3)
+			if (gl_mesh_drawmode.integer >= 3)
 			{
 				// GL 1.2 or GL 1.1 with extension
+				GL_LockArray(0, mesh->numvertices);
 				qglDrawRangeElements(GL_TRIANGLES, 0, mesh->numvertices, mesh->numindices, GL_UNSIGNED_INT, mesh->indices);
 				CHECKGLERROR
+				GL_UnlockArray();
 			}
-			else if (gl_mesh_drawmode.integer == 2)
+			else if (gl_mesh_drawmode.integer >= 2)
 			{
 				// GL 1.1
+				GL_LockArray(0, mesh->numvertices);
 				qglDrawElements(GL_TRIANGLES, mesh->numindices, GL_UNSIGNED_INT, mesh->indices);
 				CHECKGLERROR
+				GL_UnlockArray();
 			}
-			else if (gl_mesh_drawmode.integer == 1)
+			else if (gl_mesh_drawmode.integer >= 1)
 			{
 				int i;
 				// GL 1.1
 				// feed it manually using glArrayElement
+				GL_LockArray(0, mesh->numvertices);
 				qglBegin(GL_TRIANGLES);
 				for (i = 0;i < mesh->numindices;i++)
 					qglArrayElement(mesh->indices[i]);
 				qglEnd();
 				CHECKGLERROR
+				GL_UnlockArray();
 			}
 			else
 			{
 				int i, in;
 				// GL 1.1 but not using vertex arrays - 3dfx glquake minigl driver
 				// feed it manually
-				if (gl_mesh_drawmode.integer != 0)
-					Cvar_SetValueQuick(&gl_mesh_drawmode, 0);
 				qglBegin(GL_TRIANGLES);
 				for (i = 0;i < mesh->numindices;i++)
 				{