From 070f2808959dde535cbbdf0938ca9490f6231374 Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Sun, 19 Mar 2006 21:17:14 +0000 Subject: Disable tnl programs when doing software vertex programs. compiz with its texrect and lighting needs was broken because of this. --- src/mesa/drivers/dri/r300/r300_state.c | 4 ++++ 1 file changed, 4 insertions(+) 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; -- cgit v1.2.3