From af2aa8e9cf88a9ee3ec338eddc9a47bf2f142cb7 Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 21 Jul 2007 10:06:18 -0600 Subject: Remove ctx->Point._Size and ctx->Line._Width. The clamping for these values depends on whether we're drawing AA or non-AA points, lines. Defer clamping until drawing time. Drivers could compute and keep clamped AA and clamped non-AA values if desired. --- src/mesa/tnl/t_vertex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/tnl/t_vertex.c') diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c index 6aae602037..a6728c318f 100644 --- a/src/mesa/tnl/t_vertex.c +++ b/src/mesa/tnl/t_vertex.c @@ -233,7 +233,7 @@ void _tnl_get_attr( GLcontext *ctx, const void *vin, /* If the hardware vertex doesn't have point size then use size from * GLcontext. XXX this will be wrong if drawing attenuated points! */ - dest[0] = ctx->Point._Size; + dest[0] = ctx->Point.Size; } else { _mesa_memcpy( dest, ctx->Current.Attrib[attr], 4*sizeof(GLfloat)); -- cgit v1.2.3 From a956184f70733bd22e2bbee515386da12302963f Mon Sep 17 00:00:00 2001 From: Patrice Mandin Date: Thu, 6 Sep 2007 19:12:58 +0200 Subject: Disable an assert for hw that do not emit POS as first vertex attrib, like nv1x --- src/mesa/tnl/t_vertex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/tnl/t_vertex.c') diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c index a6728c318f..da32be9a17 100644 --- a/src/mesa/tnl/t_vertex.c +++ b/src/mesa/tnl/t_vertex.c @@ -294,7 +294,7 @@ GLuint _tnl_install_attrs( GLcontext *ctx, const struct tnl_attr_map *map, GLuint i, j; assert(nr < _TNL_ATTRIB_MAX); - assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS); +/* assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS);*/ vtx->new_inputs = ~0; vtx->need_viewport = GL_FALSE; -- cgit v1.2.3 From 3d17cdf55acc2b452b9f2b57a9823595615c4806 Mon Sep 17 00:00:00 2001 From: Matthieu Castet Date: Sun, 16 Sep 2007 16:15:13 +0200 Subject: revert a956184f70733bd22e2bbee515386da12302963f --- src/mesa/tnl/t_vertex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/tnl/t_vertex.c') diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c index da32be9a17..a6728c318f 100644 --- a/src/mesa/tnl/t_vertex.c +++ b/src/mesa/tnl/t_vertex.c @@ -294,7 +294,7 @@ GLuint _tnl_install_attrs( GLcontext *ctx, const struct tnl_attr_map *map, GLuint i, j; assert(nr < _TNL_ATTRIB_MAX); -/* assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS);*/ + assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS); vtx->new_inputs = ~0; vtx->need_viewport = GL_FALSE; -- cgit v1.2.3