--- Mesa-7.0.2/src/mesa/drivers/dri/r300/r300_state.c~	2008-01-03 16:29:44.000000000 +0100
+++ Mesa-7.0.2/src/mesa/drivers/dri/r300/r300_state.c	2008-01-03 16:29:44.000000000 +0100
@@ -2003,20 +2003,8 @@ void r300UpdateShaders(r300ContextPtr rm
 	if (rmesa->NewGLState && hw_tcl_on) {
 		rmesa->NewGLState = 0;
 
-		for (i = _TNL_FIRST_MAT; i <= _TNL_LAST_MAT; i++) {
-			rmesa->temp_attrib[i] =
-			    TNL_CONTEXT(ctx)->vb.AttribPtr[i];
-			TNL_CONTEXT(ctx)->vb.AttribPtr[i] =
-			    &rmesa->dummy_attrib[i];
-		}
-
 		_tnl_UpdateFixedFunctionProgram(ctx);
 
-		for (i = _TNL_FIRST_MAT; i <= _TNL_LAST_MAT; i++) {
-			TNL_CONTEXT(ctx)->vb.AttribPtr[i] =
-			    rmesa->temp_attrib[i];
-		}
-
 		r300SelectVertexShader(rmesa);
 		vp = (struct r300_vertex_program *)
 		    CURRENT_VERTEX_SHADER(ctx);