just pass ctx to do_ndc_cliptest() rather than stuffing it in the arb_vp_machine...

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index e63740c55739ec6649c4c7a27cb6f10d24beb844..c6f7f7ff8f05af5ec721a05f2a54709feae37943 100644 (file)
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1136,9 +1136,9 @@ static void userclip( GLcontext *ctx,
 }
 
 
-static GLboolean do_ndc_cliptest( struct arb_vp_machine *m )
+static GLboolean
+do_ndc_cliptest(GLcontext *ctx, struct arb_vp_machine *m)
 {
-   GLcontext *ctx = m->ctx;
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = m->VB;
 
@@ -1353,7 +1353,7 @@ run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 
    /* Perform NDC and cliptest operations:
     */
-   return do_ndc_cliptest(m);
+   return do_ndc_cliptest(ctx, m);
 }
 
 
@@ -1411,7 +1411,6 @@ static GLboolean init_vertex_program( GLcontext *ctx,
    /* arb_vertex_machine struct should subsume the VB:
     */
    m->VB = VB;
-   m->ctx = ctx;
 
    m->File[0] = ALIGN_MALLOC(REG_MAX * sizeof(GLfloat) * 4, 16);
 

diff --git a/src/mesa/tnl/t_vb_arbprogram.h b/src/mesa/tnl/t_vb_arbprogram.h
index 5461820fbb66558e77f007fd32b519c058190291..4e73d2cde1f1857c9b89cef14f0b6af5a3f6be28 100644 (file)
--- a/src/mesa/tnl/t_vb_arbprogram.h
+++ b/src/mesa/tnl/t_vb_arbprogram.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  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"),
@@ -149,7 +149,7 @@ struct output {
 #endif
 
 
-/*!
+/**
  * Private storage for the vertex program pipeline stage.
  */
 struct arb_vp_machine {
@@ -169,7 +169,6 @@ struct arb_vp_machine {
    GLuint vtx_nr;              /**< loop counter */
 
    struct vertex_buffer *VB;
-   GLcontext *ctx;
 
    GLshort fpucntl_rnd_neg;    /* constant value */
    GLshort fpucntl_restore;    /* constant value */