From 588225770c60834dfd2a95850435cc549167dc05 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Mon, 5 Jan 2004 15:24:53 +0000 Subject: Beef up t_vertex.c: - cope with input vectors with size less than that of the emitted attribute. - cope with vertices with 'holes' inside and between vertices. Fix calculation of tnl->render_inputs to work with fp programs. Mirror VB->PointSizePtr in VB->AttribPtr so that it can work with t_vertex.c. Transition swrast_setup/ to use t_vertex.c to build swrast vertices. --- src/mesa/tnl/t_context.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/mesa/tnl/t_context.c') diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 8b83372fa7..ec5f88cd96 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -161,7 +161,7 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state ) if (ctx->Visual.rgbMode) { tnl->render_inputs = (_TNL_BIT_POS| _TNL_BIT_COLOR0| - (ctx->Texture._EnabledUnits << _TNL_ATTRIB_TEX0)); + (ctx->Texture._EnabledCoordUnits << _TNL_ATTRIB_TEX0)); if (NEED_SECONDARY_COLOR(ctx)) tnl->render_inputs |= _TNL_BIT_COLOR1; @@ -179,6 +179,10 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state ) if (ctx->RenderMode == GL_FEEDBACK) tnl->render_inputs |= _TNL_BIT_TEX0; + + if (ctx->Point._Attenuated || + (ctx->VertexProgram.Enabled && ctx->VertexProgram.PointSizeEnabled)) + tnl->render_inputs |= _TNL_BIT_POINTSIZE; } -- cgit v1.2.3