diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-12-13 00:57:24 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-12-13 00:57:24 +0000 |
| commit | 9e33f91f4bf070a9dfc662031402577cfa0e35b4 (patch) | |
| tree | 82810dcd7aed71e31ae3d71d01100384eadc3222 | |
| parent | aa2bbcbcd383fa62bbacdc3b34f79aa61e370477 (diff) | |
silence compiler warnings (XFree86 sync)
| -rw-r--r-- | src/mesa/main/varray.c | 20 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 6 |
2 files changed, 15 insertions, 11 deletions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 60fc14b06d..6e2dbf8916 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1,4 +1,4 @@ -/* $Id: varray.c,v 1.22.4.3 2000/11/26 21:10:26 brianp Exp $*/ +/* $Id: varray.c,v 1.22.4.4 2000/12/13 00:57:24 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -781,11 +781,11 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count) #endif GLint remaining = count; GLint i; - struct gl_client_array *Normal; - struct gl_client_array *Color; - struct gl_client_array *Index; + struct gl_client_array *Normal = 0; + struct gl_client_array *Color = 0; + struct gl_client_array *Index = 0; struct gl_client_array *TexCoord[MAX_TEXTURE_UNITS]; - struct gl_client_array *EdgeFlag; + struct gl_client_array *EdgeFlag = 0; struct immediate *IM = VB->IM; struct gl_pipeline *elt = &ctx->CVA.elt; GLboolean relock; @@ -1367,12 +1367,12 @@ void _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer) { GET_CURRENT_CONTEXT(ctx); - GLboolean tflag, cflag, nflag; /* enable/disable flags */ - GLint tcomps, ccomps, vcomps; /* components per texcoord, color, vertex */ + GLboolean tflag, cflag, nflag; /* enable/disable flags */ + GLint tcomps, ccomps, vcomps; /* components per texcoord, color, vertex */ - GLenum ctype; /* color type */ - GLint coffset, noffset, voffset;/* color, normal, vertex offsets */ - GLint defstride; /* default stride */ + GLenum ctype = 0; /* color type */ + GLint coffset = 0, noffset = 0, voffset = 0;/* color, normal, vertex offsets */ + GLint defstride; /* default stride */ GLint c, f; GLint coordUnitSave; diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index d08872728b..68dbc62385 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -1,4 +1,3 @@ -/* $Id: varray.h,v 1.7 2000/06/12 15:30:52 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -139,4 +138,9 @@ extern void gl_exec_array_elements( GLcontext *ctx, extern void gl_update_client_state( GLcontext *ctx ); +#ifdef VAO +struct gl_array_object * +_mesa_alloc_vertex_array_object(GLcontext *ctx, GLuint name); +#endif + #endif |