From d475730357ff1595470fbe9856b2c88ad0a771ca Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Oct 2000 19:54:49 +0000
Subject: 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.

---
 src/mesa/main/context.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main/context.c')

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 );
 
-- 
cgit v1.2.3