cosmetic changes;

[mesa.git] / src / mesa / tnl / t_vb_points.c

diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c
index 7a071ed373995d3d70dcbc2fd482a20726ad979c..de866974473ec34459c9273a4d6968bbba8c5e30 100644 (file)
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  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"),
@@ -65,6 +64,7 @@ static GLboolean run_point_stage( GLcontext *ctx,
    }
 
    VB->PointSizePtr = &store->PointSize;
+   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->PointSize;
 
    return GL_TRUE;
 }
@@ -75,7 +75,7 @@ static GLboolean run_point_stage( GLcontext *ctx,
  */
 static void check_point_size( GLcontext *ctx, struct tnl_pipeline_stage *d )
 {
-   d->active = ctx->Point._Attenuated && !ctx->VertexProgram.Enabled;
+   d->active = ctx->Point._Attenuated && !ctx->VertexProgram._Enabled;
 }
 
 static GLboolean alloc_point_data( GLcontext *ctx,
@@ -103,17 +103,17 @@ static void free_point_data( struct tnl_pipeline_stage *stage )
    if (store) {
       _mesa_vector4f_free( &store->PointSize );
       FREE( store );
-      stage->privatePtr = 0;
+      stage->privatePtr = NULL;
    }
 }
 
 const struct tnl_pipeline_stage _tnl_point_attenuation_stage =
 {
    "point size attenuation",   /* name */
-   _NEW_POINT,                 /* build_state_change */
-   _NEW_POINT,                 /* run_state_change */
+   _NEW_POINT|_NEW_PROGRAM,    /* check_state */
+   _NEW_POINT,                 /* run_state */
    GL_FALSE,                   /* active */
-   _TNL_BIT_POS,                       /* inputs */
+   _TNL_BIT_POS,               /* inputs */
    _TNL_BIT_POS,               /* outputs */
    0,                          /* changed_inputs (temporary value) */
    NULL,                       /* stage private data */