diff options
| -rw-r--r-- | src/mesa/main/fbobject.c | 14 | ||||
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index cec38381613..807fac0a393 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -391,6 +391,8 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format, static void fbo_incomplete(const char *msg, int index) { + (void) msg; + (void) index; /* _mesa_debug(NULL, "FBO Incomplete: %s [%d]\n", msg, index); */ @@ -751,12 +753,12 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, return; } - if (width < 1 || width > ctx->Const.MaxRenderbufferSize) { + if (width < 1 || width > (GLsizei) ctx->Const.MaxRenderbufferSize) { _mesa_error(ctx, GL_INVALID_VALUE, "glRenderbufferStorageEXT(width)"); return; } - if (height < 1 || height > ctx->Const.MaxRenderbufferSize) { + if (height < 1 || height > (GLsizei) ctx->Const.MaxRenderbufferSize) { _mesa_error(ctx, GL_INVALID_VALUE, "glRenderbufferStorageEXT(height)"); return; } @@ -771,8 +773,8 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, FLUSH_VERTICES(ctx, _NEW_BUFFERS); if (rb->InternalFormat == internalFormat && - rb->Width == width && - rb->Height == height) { + rb->Width == (GLuint) width && + rb->Height == (GLuint) height) { /* no change in allocation needed */ return; } @@ -792,8 +794,8 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, if (rb->AllocStorage(ctx, rb, internalFormat, width, height)) { /* No error - check/set fields now */ assert(rb->_ActualFormat); - assert(rb->Width == width); - assert(rb->Height == height); + assert(rb->Width == (GLuint) width); + assert(rb->Height == (GLuint) height); assert(rb->RedBits || rb->GreenBits || rb->BlueBits || rb->AlphaBits || rb->DepthBits || rb->StencilBits || rb->IndexBits); rb->InternalFormat = internalFormat; diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 02ff833dab4..520ea02b61c 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -259,7 +259,7 @@ struct ureg { GLuint pad:5; }; -const static struct ureg undef = { +static const struct ureg undef = { ~0, ~0, 0, @@ -342,7 +342,7 @@ static GLboolean is_undef( struct ureg reg ) static struct ureg get_temp( struct texenv_fragment_program *p ) { - int bit; + GLint bit; /* First try and reuse temps which have been used already: */ @@ -358,7 +358,7 @@ static struct ureg get_temp( struct texenv_fragment_program *p ) _mesa_exit(1); } - if (bit > p->program->Base.NumTemporaries) + if ((GLuint) bit > p->program->Base.NumTemporaries) p->program->Base.NumTemporaries = bit; p->temp_in_use |= 1<<(bit-1); @@ -386,7 +386,7 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p ) _mesa_exit(1); } - if (bit > p->program->Base.NumTemporaries) + if ((GLuint) bit > p->program->Base.NumTemporaries) p->program->Base.NumTemporaries = bit; p->temp_in_use |= 1<<(bit-1); |