Mesa (mesa_7_7_branch): r300: remove unnecessary code

Alex Deucher agd5f at kemper.freedesktop.org
Mon Mar 8 08:33:40 PST 2010


Module: Mesa
Branch: mesa_7_7_branch
Commit: b584e780ab168b86800a2bd1b2aa1d09594c16f9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b584e780ab168b86800a2bd1b2aa1d09594c16f9

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Sat Mar  6 13:09:47 2010 +0100

r300: remove unnecessary code

_tnl_UpdateFixedFunctionProgram is already called in r300_draw.c

---

 src/mesa/drivers/dri/r300/r300_state.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 66b57e5..7fe6442 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1984,23 +1984,6 @@ void r300UpdateShaders(r300ContextPtr rmesa)
 	if (rmesa->options.hw_tcl_enabled) {
 		struct r300_vertex_program *vp;
 
-		if (rmesa->radeon.NewGLState) {
-			int i;
-			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];
-			}
-		}
-
 		vp = r300SelectAndTranslateVertexShader(ctx);
 
 		r300SwitchFallback(ctx, R300_FALLBACK_VERTEX_PROGRAM, vp->error);



More information about the mesa-commit mailing list