From: Aapo Tahkola <aet@rasterburn.org>
Date: Sun, 19 Mar 2006 21:17:14 +0000 (+0000)
Subject: Disable tnl programs when doing software vertex programs. compiz with its texrect... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=070f2808959dde535cbbdf0938ca9490f6231374;p=mesa.git

Disable tnl programs when doing software vertex programs. compiz with its texrect and lighting needs was broken because of this.
---

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 728ff40ad39..95bace9dd14 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;