diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-07 05:06:11 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-07 05:06:11 +0000 |
| commit | b51b0a847d7e7daaea69f77ab569086ef81c24a2 (patch) | |
| tree | 165cf8b023e6c7b1f66dacc46a6c37110ef27ea7 /src/mesa/main/varray.c | |
| parent | 249aebdd357d20f6326137c967c6b3923bef6c05 (diff) | |
fixed a bunch of g++ warnings/errors. Compiling with g++ can help find lots of potential problems
Diffstat (limited to 'src/mesa/main/varray.c')
| -rw-r--r-- | src/mesa/main/varray.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index fdc2a908ec..6d63bc1195 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1,4 +1,4 @@ -/* $Id: varray.c,v 1.37 2001/03/03 20:33:28 brianp Exp $ */ +/* $Id: varray.c,v 1.38 2001/03/07 05:06:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -654,14 +654,14 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer) _mesa_TexCoordPointer( tcomps, GL_FLOAT, stride, (GLubyte *) pointer + i * coffset ); } - for (i = factor; i < ctx->Const.MaxTextureUnits; i++) { + for (i = factor; i < (GLint) ctx->Const.MaxTextureUnits; i++) { _mesa_ClientActiveTextureARB( (GLenum) (GL_TEXTURE0_ARB + i) ); _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY ); } } else { GLint i; - for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { + for (i = 0; i < (GLint) ctx->Const.MaxTextureUnits; i++) { _mesa_ClientActiveTextureARB( (GLenum) (GL_TEXTURE0_ARB + i) ); _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY ); } @@ -707,7 +707,8 @@ _mesa_LockArraysEXT(GLint first, GLsizei count) if (MESA_VERBOSE & VERBOSE_API) fprintf(stderr, "glLockArrays %d %d\n", first, count); - if (first == 0 && count > 0 && count <= ctx->Const.MaxArrayLockSize) { + if (first == 0 && count > 0 && + count <= (GLint) ctx->Const.MaxArrayLockSize) { ctx->Array.LockFirst = first; ctx->Array.LockCount = count; } |