summaryrefslogtreecommitdiff
path: root/src/mesa/tnl/t_pipeline.c
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-04-16 10:58:30 -0600
committerBrian <brian@yutani.localnet.net>2007-04-16 10:58:30 -0600
commit4b3835dadf37267ad5fba8ffd675e826d3691f9a (patch)
tree4cf39c93934851735d9f77f2508df4dba0a5aa83 /src/mesa/tnl/t_pipeline.c
parent64e8088667d000a70beff93e8c300ac0bd261a60 (diff)
unhook t_vb_arbprogram.c code - it's going away
Diffstat (limited to 'src/mesa/tnl/t_pipeline.c')
-rw-r--r--src/mesa/tnl/t_pipeline.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index a50a3f0f2f..c7188da34a 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -1,9 +1,8 @@
-
/*
* Mesa 3-D graphics library
- * Version: 6.5
+ * Version: 6.5.3
*
- * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -204,16 +203,13 @@ const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
&_tnl_texgen_stage,
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
-#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_ARB_vertex_program)
- &_tnl_arb_vertex_program_stage,
&_tnl_vertex_program_stage,
-#endif
&_tnl_render_stage,
NULL
};
const struct tnl_pipeline_stage *_tnl_vp_pipeline[] = {
- &_tnl_arb_vertex_program_stage,
+ &_tnl_vertex_program_stage,
&_tnl_render_stage,
NULL
};