diff options
| author | anholt <anholt> | 2003-02-21 07:15:40 +0000 |
|---|---|---|
| committer | anholt <anholt> | 2003-02-21 07:15:40 +0000 |
| commit | 7ee9f8d25e3ffe804ca112e9f75cabdc676fbe4e (patch) | |
| tree | 46c16ec3bb1a11c4d3be23861a09f9711acaad1f /xc/extras/Mesa/src/tnl/t_pipeline.c | |
| parent | eb77d6f367c09f476fc06263d7653dd5b4aecf7f (diff) | |
Merge from trunk to bsd-4-0-0-branch.bsd-4-0-0-20030220bsd-4-0-0-branch
Diffstat (limited to 'xc/extras/Mesa/src/tnl/t_pipeline.c')
| -rw-r--r-- | xc/extras/Mesa/src/tnl/t_pipeline.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xc/extras/Mesa/src/tnl/t_pipeline.c b/xc/extras/Mesa/src/tnl/t_pipeline.c index dcd4b27a0..144710e51 100644 --- a/xc/extras/Mesa/src/tnl/t_pipeline.c +++ b/xc/extras/Mesa/src/tnl/t_pipeline.c @@ -1,4 +1,3 @@ -/* $Id: t_pipeline.c,v 1.1.1.1 2002/10/22 13:06:18 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -24,12 +23,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * Authors: - * Keith Whitwell <keithw@valinux.com> + * Keith Whitwell <keith@tungstengraphics.com> */ #include "glheader.h" #include "context.h" -#include "mem.h" +#include "imports.h" #include "mmath.h" #include "state.h" #include "mtypes.h" @@ -186,7 +185,7 @@ void _tnl_run_pipeline( GLcontext *ctx ) * * - inserting optimized (but specialized) stages ahead of the * general-purpose fallback implementation. For example, the old - * fastpath mechanism, which only works when the VERT_ELT input is + * fastpath mechanism, which only works when the VERT_BIT_ELT input is * available, can be duplicated by placing the fastpath stage at the * head of this pipeline. Such specialized stages are currently * constrained to have no outputs (ie. they must either finish the * @@ -203,6 +202,9 @@ const struct gl_pipeline_stage *_tnl_default_pipeline[] = { &_tnl_texgen_stage, &_tnl_texture_transform_stage, &_tnl_point_attenuation_stage, +#if FEATURE_NV_vertex_program + &_tnl_vertex_program_stage, +#endif &_tnl_render_stage, 0 }; |