Simplify the pipeline_stage structure

	- remove input/output fields, input tracking removed.
	- remove state fields, the validate function now called
	  on every statechange.
	- add an explicit 'create' function.

Add in code to build vertex program to implement current t&l state.  Still
disabled, but turn on with a #define in t_vp_build.h.

1 files changed, 18 insertions, 35 deletions

diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c
index de86697447..ccceba3262 100644
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -44,39 +44,31 @@ struct point_stage_data {
 static GLboolean run_point_stage( GLcontext *ctx,
 				  struct tnl_pipeline_stage *stage )
 {
-   struct point_stage_data *store = POINT_STAGE_DATA(stage);
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   const GLfloat (*eye)[4] = (const GLfloat (*)[4]) VB->EyePtr->data;
-   const GLfloat p0 = ctx->Point.Params[0];
-   const GLfloat p1 = ctx->Point.Params[1];
-   const GLfloat p2 = ctx->Point.Params[2];
-   const GLfloat pointSize = ctx->Point._Size;
-   GLfloat (*size)[4] = store->PointSize.data;
-   GLuint i;
-
-   if (stage->changed_inputs) {
-      /* XXX do threshold and min/max clamping here? */
+   if (ctx->Point._Attenuated && !ctx->VertexProgram._Enabled) {
+      struct point_stage_data *store = POINT_STAGE_DATA(stage);
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+      const GLfloat (*eye)[4] = (const GLfloat (*)[4]) VB->EyePtr->data;
+      const GLfloat p0 = ctx->Point.Params[0];
+      const GLfloat p1 = ctx->Point.Params[1];
+      const GLfloat p2 = ctx->Point.Params[2];
+      const GLfloat pointSize = ctx->Point._Size;
+      GLfloat (*size)[4] = store->PointSize.data;
+      GLuint i;
+
       for (i = 0; i < VB->Count; i++) {
 	 const GLfloat dist = -eye[i][2];
 	 /* GLfloat dist = SQRTF(pos[0]*pos[0]+pos[1]*pos[1]+pos[2]*pos[2]);*/
 	 size[i][0] = pointSize / (p0 + dist * (p1 + dist * p2));
       }
-   }
 
-   VB->PointSizePtr = &store->PointSize;
-   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->PointSize;
+      VB->PointSizePtr = &store->PointSize;
+      VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->PointSize;
+   }
 
    return GL_TRUE;
 }
 
 
-/* If point size attenuation is on we'll compute the point size for
- * each vertex in a special pipeline stage.
- */
-static void check_point_size( GLcontext *ctx, struct tnl_pipeline_stage *d )
-{
-   d->active = ctx->Point._Attenuated && !ctx->VertexProgram._Enabled;
-}
 
 static GLboolean alloc_point_data( GLcontext *ctx,
 				   struct tnl_pipeline_stage *stage )
@@ -89,11 +81,7 @@ static GLboolean alloc_point_data( GLcontext *ctx,
       return GL_FALSE;
 
    _mesa_vector4f_alloc( &store->PointSize, 0, VB->Size, 32 );
-
-   /* Now run the stage.
-    */
-   stage->run = run_point_stage;
-   return stage->run( ctx, stage );
+   return GL_TRUE;
 }
 
 
@@ -110,14 +98,9 @@ static void free_point_data( struct tnl_pipeline_stage *stage )
 const struct tnl_pipeline_stage _tnl_point_attenuation_stage =
 {
    "point size attenuation",	/* name */
-   _NEW_POINT|_NEW_PROGRAM,	/* check_state */
-   _NEW_POINT,			/* run_state */
-   GL_FALSE,			/* active */
-   _TNL_BIT_POS,		/* inputs */
-   _TNL_BIT_POS,		/* outputs */
-   0,				/* changed_inputs (temporary value) */
    NULL,			/* stage private data */
+   alloc_point_data,		/* alloc data */
    free_point_data,		/* destructor */
-   check_point_size,		/* check */
-   alloc_point_data		/* run -- initially set to alloc data */
+   NULL,
+   run_point_stage		/* run */
 };