diff options
author | Aapo Tahkola <aet@rasterburn.org> | 2006-06-06 22:24:12 +0000 |
---|---|---|
committer | Aapo Tahkola <aet@rasterburn.org> | 2006-06-06 22:24:12 +0000 |
commit | 9248882ca27b289180a76262aa3d9b26c0cb0e8b (patch) | |
tree | 4be41552706b53802d8a034e70c132d98cd7a827 /src/mesa/drivers/dri/r300/r300_state.c | |
parent | 9ba2006594a54173956b2af69055f633fa813bf8 (diff) |
prevent run_arb_vertex_program from running tnl programs unless ctx->_MaintainTnlProgram is set
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 70d42c2ea3..1e06992394 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1678,10 +1678,6 @@ 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; |