diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-04 16:43:28 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-04 16:43:28 +0000 |
| commit | 8ff68b2bf3d67f84f52d92686143175cb5446f76 (patch) | |
| tree | ee02e651f2955398cde42e3754aeca879ba5c4c9 /src/mesa/tnl | |
| parent | c12ee99d119debe1a421a77c1cc6d99d958ae94b (diff) | |
just pass ctx to do_ndc_cliptest() rather than stuffing it in the arb_vp_machine struct
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_vb_arbprogram.c | 7 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_arbprogram.h | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c index e63740c557..c6f7f7ff8f 100644 --- 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 5461820fbb..4e73d2cde1 100644 --- 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 */ |