summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 728ff40ad3..95bace9dd1 100644
--- 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;