diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-20 19:54:49 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-20 19:54:49 +0000 |
| commit | d475730357ff1595470fbe9856b2c88ad0a771ca (patch) | |
| tree | 4e08bd0daca110c84d6deaeff942a5adc1076890 /src/mesa/main/context.c | |
| parent | a2d2aed64aebcce9cb3aa777628bc14a08f595aa (diff) | |
Changes for multitexture > 3, code clean-ups.
Added GLboolean ctx->Texture.MultiTextureEnabled to determine when
multitexture is enabled. Eventually ctx->Texture.ReallyEnabled may
become a boolean.
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 34180a78c2..3f4bcec2fb 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.92 2000/10/09 22:42:40 brianp Exp $ */ +/* $Id: context.c,v 1.93 2000/10/20 19:54:49 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -882,8 +882,14 @@ init_attrib_groups( GLcontext *ctx ) ASSIGN_3V( ctx->Current.Normal, 0.0, 0.0, 1.0 ); ctx->Current.Primitive = (GLenum) (GL_POLYGON + 1); - ctx->Current.Flag = (VERT_NORM|VERT_INDEX|VERT_RGBA|VERT_EDGE| - VERT_TEX0_1|VERT_TEX1_1|VERT_MATERIAL); + ctx->Current.Flag = (VERT_NORM | + VERT_INDEX | + VERT_RGBA | + VERT_EDGE | + VERT_TEX0_1 | + VERT_TEX1_1 | + VERT_TEX2_1 | /* XXX fix for MAX_TEXTURE_UNITS > 3 */ + VERT_MATERIAL); init_fallback_arrays( ctx ); |