From 58e991705392a2e17a1c8b034f4083a0adaf1943 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 5 Jan 2001 02:26:48 +0000 Subject: Remove 'pv' parameter from Line/Tri/Point funcs. The provoking vertex is always the last vertex parameter. Modify clipping to preserve pv colors. Modify swrast and X11 driver to expect the pv in the last vertex (was looking in the first vertex previously). Remove all handling of flatshading from swrast_setup. Allow drivers to override the unclipped render tabs in tnl_render_stage directly. (Like in 3.4). Removed fxsimplerender stage. Modified t_vb_rendertmp.h to remove the need for 'parity' arguments in RENDER_TRI macros. --- src/mesa/tnl/t_array_import.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/mesa/tnl/t_array_import.c') diff --git a/src/mesa/tnl/t_array_import.c b/src/mesa/tnl/t_array_import.c index fc2c3d1944..008cc23c64 100644 --- a/src/mesa/tnl/t_array_import.c +++ b/src/mesa/tnl/t_array_import.c @@ -1,4 +1,4 @@ -/* $Id: t_array_import.c,v 1.3 2000/12/28 22:11:05 keithw Exp $ */ +/* $Id: t_array_import.c,v 1.4 2001/01/05 02:26:49 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -301,11 +301,6 @@ static void _tnl_upgrade_client_data( GLcontext *ctx, _tnl_import_texcoord( ctx, i, writeable, stride ); } - if ((required & VERT_EDGE) && (VB->EdgeFlagPtr->flags & flags)) { - ASSERT(VB->EdgeFlagPtr == &inputs->EdgeFlag); - _tnl_import_edgeflag( ctx, writeable, stride ); - } - VB->importable_data &= ~required; } @@ -386,11 +381,8 @@ void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLsizei count ) } if (inputs & VERT_EDGE) { - if (imports & VERT_EDGE) { - _tnl_import_edgeflag( ctx, 0, 0 ); - tmp->EdgeFlag.count = VB->Count; - } - VB->EdgeFlagPtr = &tmp->EdgeFlag; + _tnl_import_edgeflag( ctx, GL_TRUE, sizeof(GLboolean) ); + VB->EdgeFlag = (GLboolean *) tmp->EdgeFlag.data; } if (inputs & VERT_SPEC_RGB) { -- cgit v1.2.3