From: Brian Paul <brianp@vmware.com>
Date: Sun, 4 Nov 2012 23:43:44 +0000 (-0700)
Subject: mesa: fix signed/unsigned MSVC warnings in fbobject.c
X-Git-Tag: android-x86-4.4-r1~2894
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=859c387603e24848d309dac829af6e675b1ee6d9;p=android-x86%2Fexternal-mesa.git

mesa: fix signed/unsigned MSVC warnings in fbobject.c

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 2be61fb3c80..0758d55574a 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2059,7 +2059,8 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
       }
       else if ((texObj->Target == GL_TEXTURE_1D_ARRAY_EXT) ||
                (texObj->Target == GL_TEXTURE_2D_ARRAY_EXT)) {
-         if (zoffset < 0 || zoffset >= ctx->Const.MaxArrayTextureLayers) {
+         if (zoffset < 0 ||
+             zoffset >= (GLint) ctx->Const.MaxArrayTextureLayers) {
             _mesa_error(ctx, GL_INVALID_VALUE,
                         "glFramebufferTexture%sEXT(layer)", caller);
             return;
@@ -3151,7 +3152,7 @@ invalidate_framebuffer_storage(GLenum target, GLsizei numAttachments,
          case GL_COLOR_ATTACHMENT13:
          case GL_COLOR_ATTACHMENT14:
          case GL_COLOR_ATTACHMENT15: {
-            const int k = attachments[i] - GL_COLOR_ATTACHMENT0;
+            unsigned k = attachments[i] - GL_COLOR_ATTACHMENT0;
             if (k >= ctx->Const.MaxColorAttachments) {
                _mesa_error(ctx, GL_INVALID_OPERATION,
                            "%s(attachment >= max. color attachments)", name);