X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.c;h=fa0aba57999ad42dfa2d22200b134a8cb3826a27;hb=a3a9fdaf8edba37e4c895b2f10926481c46916a0;hp=750a9c187a4543013d1df26a408b8b70ae5babbf;hpb=5945ed0424fa3aedd752e78c822277e41eef2463;p=xonotic%2Fdarkplaces.git

diff --git a/gl_backend.c b/gl_backend.c
index 750a9c18..fa0aba57 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -6,7 +6,6 @@ cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1", "use gl
 cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0", "use glBegin(GL_TRIANGLES);glArrayElement();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"};
 cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0", "use glBegin(GL_TRIANGLES);glTexCoord2f();glVertex3f();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"};
 cvar_t gl_mesh_prefer_short_elements = {0, "gl_mesh_prefer_short_elements", "1", "use GL_UNSIGNED_SHORT element arrays instead of GL_UNSIGNED_INT"};
-cvar_t gl_workaround_mac_texmatrix = {0, "gl_workaround_mac_texmatrix", "0", "if set to 1 this always calls glClientActiveTexture when calling glActiveTexture, to work around mistargeted texture matrix updates on Mac OSX drivers"};
 cvar_t gl_paranoid = {0, "gl_paranoid", "0", "enables OpenGL error checking and other tests"};
 cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0", "prints all OpenGL error checks, useful to identify location of driver crashes"};
 
@@ -16,7 +15,7 @@ cvar_t gl_polyblend = {CVAR_SAVE, "gl_polyblend", "1", "tints view while underwa
 cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1", "enables OpenGL dithering (16bit looks bad with this off)"};
 cvar_t gl_lockarrays = {0, "gl_lockarrays", "0", "enables use of glLockArraysEXT, may cause glitches with some broken drivers, and may be slower than normal"};
 cvar_t gl_lockarrays_minimumvertices = {0, "gl_lockarrays_minimumvertices", "1", "minimum number of vertices required for use of glLockArraysEXT, setting this too low may reduce performance"};
-cvar_t gl_vbo = {CVAR_SAVE, "gl_vbo", "1", "make use of GL_ARB_vertex_buffer_object extension to store static geometry in video memory for faster rendering"};
+cvar_t gl_vbo = {CVAR_SAVE, "gl_vbo", "3", "make use of GL_ARB_vertex_buffer_object extension to store static geometry in video memory for faster rendering, 0 disables VBO allocation or use, 1 enables VBOs for vertex and triangle data, 2 only for vertex data, 3 for vertex data and triangle data of simple meshes (ones with only one surface)"};
 
 cvar_t v_flipped = {0, "v_flipped", "0", "mirror the screen (poor man's left handed mode)"};
 qboolean v_flipped_state = false;
@@ -256,7 +255,6 @@ void gl_backend_init(void)
 	Cvar_RegisterVariable(&gl_vbo);
 	Cvar_RegisterVariable(&gl_paranoid);
 	Cvar_RegisterVariable(&gl_printcheckerror);
-	Cvar_RegisterVariable(&gl_workaround_mac_texmatrix);
 #ifdef NORENDER
 	Cvar_SetValue("r_render", 0);
 #endif
@@ -609,8 +607,6 @@ void GL_SetupTextureState(void)
 
 	for (i = 0;i < backendarrayunits;i++)
 	{
-		if (gl_workaround_mac_texmatrix.integer)
-			GL_ActiveTexture(i);
 		GL_ClientActiveTexture(i);
 		GL_BindVBO(0);
 		qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR
@@ -620,8 +616,6 @@ void GL_SetupTextureState(void)
 	for (i = 0;i < backendunits;i++)
 	{
 		GL_ActiveTexture(i);
-		if (gl_workaround_mac_texmatrix.integer)
-			GL_ClientActiveTexture(i);
 		qglDisable(GL_TEXTURE_1D);CHECKGLERROR
 		qglDisable(GL_TEXTURE_2D);CHECKGLERROR
 		if (gl_texture3d)
@@ -726,8 +720,6 @@ void GL_ActiveTexture(unsigned int num)
 			CHECKGLERROR
 		}
 	}
-	if (gl_workaround_mac_texmatrix.integer)
-		GL_ClientActiveTexture(num);
 }
 
 void GL_ClientActiveTexture(unsigned int num)
@@ -1157,8 +1149,6 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
 		{
 			if (gl_state.units[i].arrayenabled)
 			{
-				if (gl_workaround_mac_texmatrix.integer)
-					GL_ActiveTexture(i);
 				GL_ClientActiveTexture(i);
 				if (!qglIsEnabled(GL_TEXTURE_COORD_ARRAY))
 					Con_Print("R_Mesh_Draw: texcoord array set but not enabled\n");
@@ -1552,8 +1542,6 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co
 		if (!unit->arrayenabled)
 		{
 			unit->arrayenabled = true;
-			if (gl_workaround_mac_texmatrix.integer)
-				GL_ActiveTexture(unitnum);
 			GL_ClientActiveTexture(unitnum);
 			qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
 		}
@@ -1564,8 +1552,6 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co
 			unit->pointer_texcoord_buffer = bufferobject;
 			unit->pointer_texcoord_offset = bufferoffset;
 			unit->arraycomponents = numcomponents;
-			if (gl_workaround_mac_texmatrix.integer)
-				GL_ActiveTexture(unitnum);
 			GL_ClientActiveTexture(unitnum);
 			GL_BindVBO(bufferobject);
 			qglTexCoordPointer(unit->arraycomponents, GL_FLOAT, sizeof(float) * unit->arraycomponents, bufferobject ? (void *)bufferoffset : texcoord);CHECKGLERROR
@@ -1577,8 +1563,6 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co
 		if (unit->arrayenabled)
 		{
 			unit->arrayenabled = false;
-			if (gl_workaround_mac_texmatrix.integer)
-				GL_ActiveTexture(unitnum);
 			GL_ClientActiveTexture(unitnum);
 			qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
 		}
@@ -2169,8 +2153,6 @@ void R_Mesh_ResetTextureState(void)
 		if (unit->arrayenabled)
 		{
 			unit->arrayenabled = false;
-			if (gl_workaround_mac_texmatrix.integer)
-				GL_ActiveTexture(unitnum);
 			GL_ClientActiveTexture(unitnum);
 			qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
 		}
@@ -2184,8 +2166,8 @@ void R_Mesh_ResetTextureState(void)
 			unit->texmatrixenabled = false;
 			unit->matrix = identitymatrix;
 			CHECKGLERROR
-			qglMatrixMode(GL_TEXTURE);CHECKGLERROR
 			GL_ActiveTexture(unitnum);
+			qglMatrixMode(GL_TEXTURE);CHECKGLERROR
 			qglLoadIdentity();CHECKGLERROR
 			qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
 		}