summaryrefslogtreecommitdiff
path: root/src/mesa/tnl/t_pipeline.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2001-02-16 00:35:34 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2001-02-16 00:35:34 +0000
commit2448fc7deeaa870d879de17158f243f239c05b15 (patch)
treec5d192531cdc1043b54856b9d60f6c3e8e217b33 /src/mesa/tnl/t_pipeline.c
parent86ca15ece74ccb5a8f4d566a4b2c8024b178d73b (diff)
Fixed conform problems with recent material tracking change.
Remove redundant 'update_materials' stage. Fix conform segfault with seperate specular colors in mustpass.c. These tests still fail, however.
Diffstat (limited to 'src/mesa/tnl/t_pipeline.c')
-rw-r--r--src/mesa/tnl/t_pipeline.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 467074abaa..f1c5a255a5 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -1,4 +1,4 @@
-/* $Id: t_pipeline.c,v 1.12 2001/02/15 01:33:52 keithw Exp $ */
+/* $Id: t_pipeline.c,v 1.13 2001/02/16 00:35:35 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -202,7 +202,6 @@ void _tnl_run_pipeline( GLcontext *ctx )
* case, if it becomes necessary to do so.
*/
const struct gl_pipeline_stage *_tnl_default_pipeline[] = {
- &_tnl_update_material_stage,
&_tnl_vertex_transform_stage,
&_tnl_normal_transform_stage,
&_tnl_lighting_stage,