diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2006-03-19 21:17:14 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2006-03-19 21:17:14 +0000 |
| commit | 070f2808959dde535cbbdf0938ca9490f6231374 (patch) | |
| tree | 59e7bf42d0e0ca8b2f8d94d5af3695c86ceadcf5 | |
| parent | 096dd541bd522c6c3590bac734dac31a16fe3dea (diff) | |
Disable tnl programs when doing software vertex programs. compiz with its texrect and lighting needs was broken because of this.
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 4 |
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; |