diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 00:35:34 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 00:35:34 +0000 |
| commit | 2448fc7deeaa870d879de17158f243f239c05b15 (patch) | |
| tree | c5d192531cdc1043b54856b9d60f6c3e8e217b33 /src/mesa/tnl/t_imm_exec.c | |
| parent | 86ca15ece74ccb5a8f4d566a4b2c8024b178d73b (diff) | |
Fixed conform problems with recent material tracking change.
Remove redundant 'update_materials' stage.
Fix conform segfault with seperate specular colors in mustpass.c. These
tests still fail, however.
Diffstat (limited to 'src/mesa/tnl/t_imm_exec.c')
| -rw-r--r-- | src/mesa/tnl/t_imm_exec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index 80e5ce5440..ce64c16b31 100644 --- a/src/mesa/tnl/t_imm_exec.c +++ b/src/mesa/tnl/t_imm_exec.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_exec.c,v 1.11 2001/02/15 01:33:52 keithw Exp $ */ +/* $Id: t_imm_exec.c,v 1.12 2001/02/16 00:35:35 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -76,6 +76,8 @@ void _tnl_reset_input( GLcontext *ctx, IM->BeginState = beginstate; IM->SavedBeginState = savedbeginstate; IM->TexSize = 0; + IM->LastMaterial = 0; + IM->MaterialOrMask = 0; IM->ArrayEltFlags = ~ctx->Array._Enabled; IM->ArrayEltIncr = ctx->Array.Vertex.Enabled ? 1 : 0; |