diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-13 15:30:08 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-13 15:30:08 +0000 |
| commit | 88bf0387080da5120fbdd37bb88d90066cf2d5c9 (patch) | |
| tree | fde5fb21f58c6493e09677fe5f5f8a7e6bbdb317 | |
| parent | 85ad44b29294c2b40e147dba17cbdd8698355ca5 (diff) | |
init secondary color to (0,0,0,1). remove some redundant initializations.
| -rw-r--r-- | src/mesa/main/context.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 89154eb72a..7de8115ad1 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -980,7 +980,7 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss ) static void _mesa_init_current( GLcontext *ctx ) { - int i; + GLuint i; /* Current group */ for (i = 0; i < VERT_ATTRIB_MAX; i++) { @@ -990,10 +990,9 @@ _mesa_init_current( GLcontext *ctx ) ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_WEIGHT], 1.0, 0.0, 0.0, 1.0 ); ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_NORMAL], 0.0, 0.0, 1.0, 1.0 ); 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_COLOR1], 0.0, 0.0, 0.0, 1.0 ); ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_FOG], 0.0, 0.0, 0.0, 0.0 ); - for (i = 0; i < MAX_TEXTURE_UNITS; i++) - ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i], 0.0, 0.0, 0.0, 1.0); + ctx->Current.Index = 1; ctx->Current.EdgeFlag = GL_TRUE; } |