summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2004-01-26 21:34:28 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2004-01-26 21:34:28 +0000
commitef167c63282bb9b98492f46f9a3ad8f861db1a30 (patch)
treeb57f7ef516f7fc8a200399bfa5e16e7f1ed562ca
parentcb7c689e1411ebf4a66b6bf36711257352abc822 (diff)
Fix for recursion in generic_copy_pv_extras.
Add a comment.
-rw-r--r--src/mesa/tnl/t_vertex.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index e932ee0ca7..8f41c78874 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -409,7 +409,7 @@ static void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v,
{
UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
v[1] = 0;
- v[0]= 0;
+ v[0] = 0;
}
@@ -433,6 +433,9 @@ static void extract_4f_viewport( const struct tnl_clipspace_attr *a, GLfloat *ou
const GLfloat *in = (const GLfloat *)v;
const GLfloat * const vp = a->vp;
+ /* Although included for completeness, the position coordinate is
+ * usually handled differently during clipping.
+ */
out[0] = (in[0] - vp[12]) / vp[0];
out[1] = (in[1] - vp[13]) / vp[5];
out[2] = (in[2] - vp[14]) / vp[10];
@@ -834,7 +837,7 @@ static void generic_copy_pv_extras( GLcontext *ctx,
VB->IndexPtr[1]->data[dst][0] = VB->IndexPtr[1]->data[src][0];
}
- _tnl_copy_pv(ctx, dst, src);
+ generic_copy_pv(ctx, dst, src);
}