diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2003-08-05 18:55:49 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2003-08-05 18:55:49 +0000 |
| commit | ff56908e09c0351179478deb19677cf56eec1f64 (patch) | |
| tree | ca51e376173869a8cb44304a0105b237f1dafce9 /src/mesa/tnl/t_imm_exec.c | |
| parent | e6dea091c0a1fe9ad9720c07ddf7164e5fc45ac6 (diff) | |
Store material attributes in an Attrib[] style array. This is a
first step to reviving/rescuing the 'vtx' rework from the old mesa
tree.
Diffstat (limited to 'src/mesa/tnl/t_imm_exec.c')
| -rw-r--r-- | src/mesa/tnl/t_imm_exec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index 38108785a1..f1d6ee8925 100644 --- a/src/mesa/tnl/t_imm_exec.c +++ b/src/mesa/tnl/t_imm_exec.c @@ -154,9 +154,11 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM, } if (flag & VERT_BIT_MATERIAL) { - _mesa_update_material( ctx, - IM->Material[IM->LastMaterial], - IM->MaterialOrMask ); + _mesa_copy_materials( &ctx->Light.Material, + &IM->Material[IM->LastMaterial], + IM->MaterialOrMask ); + + _mesa_update_material( ctx, IM->MaterialOrMask ); TNL_CONTEXT(ctx)->Driver.NotifyMaterialChange( ctx ); } |