diff options
Diffstat (limited to 'xc/extras/Mesa/src/tnl/t_context.c')
| -rw-r--r-- | xc/extras/Mesa/src/tnl/t_context.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/xc/extras/Mesa/src/tnl/t_context.c b/xc/extras/Mesa/src/tnl/t_context.c index 029a22368..906953712 100644 --- a/xc/extras/Mesa/src/tnl/t_context.c +++ b/xc/extras/Mesa/src/tnl/t_context.c @@ -1,10 +1,9 @@ -/* $Id: t_context.c,v 1.1.1.1 2002/10/22 13:06:16 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.0.3 + * Version: 3.5 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2001 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"), @@ -24,14 +23,14 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * Authors: - * Keith Whitwell <keithw@valinux.com> + * Keith Whitwell <keith@tungstengraphics.com> */ #include "glheader.h" +#include "imports.h" #include "macros.h" #include "mtypes.h" -#include "mem.h" #include "dlist.h" #include "light.h" #include "vtxfmt.h" @@ -103,7 +102,7 @@ _tnl_CreateContext( GLcontext *ctx ) _tnl_install_pipeline( ctx, _tnl_default_pipeline ); - tnl->NeedProjCoords = GL_TRUE; + tnl->NeedNdcCoords = GL_TRUE; tnl->LoopbackDListCassettes = GL_FALSE; tnl->CalcDListNormalLengths = GL_TRUE; @@ -196,7 +195,7 @@ _tnl_wakeup_exec( GLcontext *ctx ) tnl->pipeline.run_input_changes = ~0; if (ctx->Light.ColorMaterialEnabled) { - _mesa_update_color_material( ctx, ctx->Current.Color ); + _mesa_update_color_material( ctx, ctx->Current.Attrib[VERT_ATTRIB_COLOR0] ); } } @@ -216,8 +215,8 @@ void _tnl_need_projected_coords( GLcontext *ctx, GLboolean mode ) { TNLcontext *tnl = TNL_CONTEXT(ctx); - if (tnl->NeedProjCoords != mode) { - tnl->NeedProjCoords = mode; + if (tnl->NeedNdcCoords != mode) { + tnl->NeedNdcCoords = mode; _tnl_InvalidateState( ctx, _NEW_PROJECTION ); } } |