fragment program execution

[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 429a0ab7cb411b402040337d6173380a5cebc082..5bf1be12a66207f9e5154926b9760b12e52a5f0c 100644 (file)
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_points.c,v 1.6 2002/01/06 03:54:12 brianp Exp $ */
+/* $Id: t_vb_points.c,v 1.10 2002/10/29 20:29:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -24,11 +24,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Brian Paul <brian@valinux.com>
+ *    Brian Paul
  */
 
 #include "mtypes.h"
-#include "mem.h"
+#include "imports.h"
 #include "t_context.h"
 #include "t_pipeline.h"
 
@@ -76,7 +76,7 @@ static GLboolean run_point_stage( GLcontext *ctx,
  */
 static void check_point_size( GLcontext *ctx, struct gl_pipeline_stage *d )
 {
-   d->active = ctx->Point._Attenuated;
+   d->active = ctx->Point._Attenuated && !ctx->VertexProgram.Enabled;
 }
 
 static GLboolean alloc_point_data( GLcontext *ctx,
@@ -114,8 +114,8 @@ const struct gl_pipeline_stage _tnl_point_attenuation_stage =
    _NEW_POINT,                 /* build_state_change */
    _NEW_POINT,                 /* run_state_change */
    GL_FALSE,                   /* active */
-   VERT_EYE,                   /* inputs */
-   VERT_POINT_SIZE,            /* outputs */
+   VERT_BIT_EYE,                       /* inputs */
+   VERT_BIT_POINT_SIZE,                /* outputs */
    0,                          /* changed_inputs (temporary value) */
    NULL,                       /* stage private data */
    free_point_data,            /* destructor */