summaryrefslogtreecommitdiff
path: root/src/mesa/tnl/t_pipeline.c
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2006-12-13 14:58:13 -0700
committerBrian <brian@yutani.localnet.net>2006-12-13 14:58:13 -0700
commita328e469d328f8b6fd5afdfc21d576fa1a2c43fc (patch)
tree5e5e2a7ef745a97abbbeca7378ea348a0836c49e /src/mesa/tnl/t_pipeline.c
parentfe1d01cb398cbcb5b28a0b222845d3865c4d612b (diff)
Checkpoint work for new GLSL compiler back-end.
Among changes: Remove ctx->FragmentProgram._Active Remove _UseTexEnvProgram Move _MaintainTnlProgram, _MaintainTexEnvProgram, _TexEnvProgram and _TnlProgram fields. Remove/disable old GLSL interpreter code.
Diffstat (limited to 'src/mesa/tnl/t_pipeline.c')
-rw-r--r--src/mesa/tnl/t_pipeline.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 2efe701a80..a50a3f0f2f 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -132,7 +132,7 @@ void _tnl_run_pipeline( GLcontext *ctx )
* (ie const or non-const).
*/
if (check_input_changes( ctx ) || tnl->pipeline.new_state) {
- if (ctx->_MaintainTnlProgram)
+ if (ctx->VertexProgram._MaintainTnlProgram)
_tnl_UpdateFixedFunctionProgram( ctx );
for (i = 0; i < tnl->pipeline.nr_stages ; i++) {
@@ -208,9 +208,6 @@ const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
&_tnl_arb_vertex_program_stage,
&_tnl_vertex_program_stage,
#endif
-#if FEATURE_ARB_vertex_shader
- &_tnl_arb_vertex_shader_stage,
-#endif
&_tnl_render_stage,
NULL
};