Index: r200_state.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_state.c,v
retrieving revision 1.46
diff -u -r1.46 r200_state.c
--- r200_state.c	2 Jun 2006 22:47:31 -0000	1.46
+++ r200_state.c	29 Aug 2006 12:35:54 -0000
@@ -2135,6 +2206,7 @@
 	 r200Fogfv( ctx, GL_FOG_COORD_SRC, NULL );
 	/* shouldn't be necessary, as it's picked up anyway in r200ValidateState (_NEW_PROGRAM),
 	   but without it doom3 locks up at always the same places. Why? */
+#if 0
 	 r200UpdateTextureState( ctx );
 	 /* if we call r200UpdateTextureState we need the code below because we are calling it with
 	    non-current derived enabled values which may revert the state atoms for frag progs even when
@@ -2154,6 +2226,7 @@
 	 R200_STATECHANGE( rmesa, cst );
 	 R200_STATECHANGE( rmesa, tf );
 	 rmesa->hw.cst.cmd[CST_PP_CNTL_X] = 0;
+#endif
       }
       else {
 	 R200_STATECHANGE( rmesa, vap );