summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-04-01 18:57:36 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-04-01 18:57:36 +0000
commitb852f048ee01b8ccbc8834139d46ab2bd9cb1f1b (patch)
treec1c2097fd5e59f0d7418f909945529274b4ebf9f
parent8d7a2504c36a855949d57a9fe3f972abb88e267a (diff)
minor initialization fixes
-rw-r--r--src/mesa/main/context.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 7c8befc0a8..690aa29d4a 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.195 2003/04/01 16:41:50 brianp Exp $ */
+/* $Id: context.c,v 1.196 2003/04/01 18:57:36 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1017,6 +1017,8 @@ init_attrib_groups( GLcontext *ctx )
ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR0], 1.0, 1.0, 1.0, 1.0 );
ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR1], 0.0, 0.0, 0.0, 0.0 );
ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_FOG], 0.0, 0.0, 0.0, 0.0 );
+ ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_SIX], 0.0, 0.0, 0.0, 1.0 );
+ ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_SEVEN], 0.0, 0.0, 0.0, 1.0 );
for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i], 0.0, 0.0, 0.0, 1.0 );
ctx->Current.Index = 1;
@@ -1398,7 +1400,7 @@ init_attrib_groups( GLcontext *ctx )
ctx->Array.Color.Ptr = NULL;
ctx->Array.Color.Enabled = GL_FALSE;
ctx->Array.Color.Flags = CA_CLIENT_DATA;
- ctx->Array.SecondaryColor.Size = 4;
+ ctx->Array.SecondaryColor.Size = 3;
ctx->Array.SecondaryColor.Type = GL_FLOAT;
ctx->Array.SecondaryColor.Stride = 0;
ctx->Array.SecondaryColor.StrideB = 0;