mesa: Branch 'master' - 2 commits

[Brian Paul]

 src/mesa/drivers/dri/i915/intel_context.c    |    1 -
 src/mesa/drivers/dri/i915tex/intel_context.c |    1 -
 src/mesa/drivers/dri/mga/mga_xmesa.c         |    1 -
 src/mesa/drivers/dri/r200/r200_context.c     |    1 -
 src/mesa/drivers/dri/r300/r300_context.c     |    1 -
 src/mesa/drivers/dri/tdfx/tdfx_context.c     |    6 ------
 src/mesa/drivers/glide/fxdd.c                |    1 -
 7 files changed, 12 deletions(-)

New commits:
diff-tree dfee7619d433a8b27fb5573d92873f9355ca6a5d (from 96e05da1c959b3dad7250ccfad1bf540bbec2fbf)
Author: Brian <brian at yutani.localnet.net>
Date:   Mon Apr 16 15:15:53 2007 -0600

    remove _tnl_arb_vertex_program_stage

diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 43d3cd9..4e56f7b 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1663,7 +1663,6 @@ static const struct tnl_pipeline_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,
diff-tree 96e05da1c959b3dad7250ccfad1bf540bbec2fbf (from 1560de2c3c7f9d4e07b34e805e649769ca5a0cbe)
Author: Brian <brian at yutani.localnet.net>
Date:   Mon Apr 16 15:15:23 2007 -0600

    remove _tnl_arb_vertex_program_stage

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index d201fcf..e1e7cdb 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -196,7 +196,6 @@ static const struct tnl_pipeline_stage *
    &_tnl_texgen_stage,
    &_tnl_texture_transform_stage,
    &_tnl_point_attenuation_stage,
-   &_tnl_arb_vertex_program_stage,
    &_tnl_vertex_program_stage,
 #if 1
    &_intel_render_stage,     /* ADD: unclipped rastersetup-to-dma */
diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c b/src/mesa/drivers/dri/i915tex/intel_context.c
index 6a3456e..c6c66e2 100644
--- a/src/mesa/drivers/dri/i915tex/intel_context.c
+++ b/src/mesa/drivers/dri/i915tex/intel_context.c
@@ -209,7 +209,6 @@ static const struct tnl_pipeline_stage *
    &_tnl_texgen_stage,
    &_tnl_texture_transform_stage,
    &_tnl_point_attenuation_stage,
-   &_tnl_arb_vertex_program_stage,
    &_tnl_vertex_program_stage,
 #if 1
    &_intel_render_stage,        /* ADD: unclipped rastersetup-to-dma */
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 5b65d1a..f4e651a 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -372,7 +372,6 @@ static const struct tnl_pipeline_stage *
    &_tnl_fog_coordinate_stage,
    &_tnl_texgen_stage, 
    &_tnl_texture_transform_stage, 
-   &_tnl_arb_vertex_program_stage,
    &_tnl_vertex_program_stage,
 
 				/* REMOVE: point attenuation stage */
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 3abcdf9..0507eb8 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -192,7 +192,6 @@ static const struct tnl_pipeline_stage *
    &_tnl_texgen_stage,
    &_tnl_texture_transform_stage,
    &_tnl_point_attenuation_stage,
-   &_tnl_arb_vertex_program_stage,
    &_tnl_vertex_program_stage,
    /* Try again to go to tcl? 
     *     - no good for asymmetric-twoside (do with multipass)
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 1f8d950..58350fe 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -148,7 +148,6 @@ static const struct tnl_pipeline_stage *
 	&_tnl_fog_coordinate_stage,
 	&_tnl_texgen_stage,
 	&_tnl_texture_transform_stage,
-	&_tnl_arb_vertex_program_stage,
 	&_tnl_vertex_program_stage,
 
 	/* Try again to go to tcl?
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index a9163f4..b4eea25 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -165,12 +165,6 @@ static const struct tnl_pipeline_stage *
    &_tnl_texgen_stage, 
    &_tnl_texture_transform_stage, 
    &_tnl_point_attenuation_stage,
-#if 0
-#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_ARB_vertex_program)
-   &_tnl_arb_vertex_program_stage,
-   &_tnl_vertex_program_stage,
-#endif
-#endif
    &_tnl_render_stage,		
    0,
 };