Disable tnl programs when doing software vertex programs. compiz with its texrect...

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 728ff40ad39a99bb1b35e590b6f308c9b6f4dc10..95bace9dd1466c8834fa94a788af3346630907c8 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1554,6 +1554,10 @@ void r300UpdateShaders(r300ContextPtr rmesa)
        
        ctx = rmesa->radeon.glCtx;
        
+       /* Disable tnl programs when doing software vertex programs.
+          I can only hope this actually disables it at the right time. */
+       ctx->_MaintainTnlProgram = hw_tcl_on;
+       
        if (rmesa->NewGLState && hw_tcl_on) {
                rmesa->NewGLState = 0;