Module: Mesa
Branch: master
Commit: 86ca4f9cb66aa39c196ae5fc37f6a270d9a1156f
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=86ca4f9cb66aa39c196ae5fc37f6a270d9a1156f

Author: Eric Anholt <[email protected]>
Date:   Mon Jan 23 15:27:36 2012 -0800

mesa: s/GLuint col/GLint col/ to avoid signed/unsigned comparison warnings.

Suggested-by: Brian Paul <[email protected]>

---

 src/mesa/main/texgetimage.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 95de24a..91b4892 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -346,7 +346,7 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint 
dimensions,
               _mesa_unpack_uint_rgba_row(texFormat, width, src, rgba_uint);
 
               if (texImage->_BaseFormat == GL_ALPHA) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba_uint[col][RCOMP] = 0;
                     rgba_uint[col][GCOMP] = 0;
@@ -354,7 +354,7 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint 
dimensions,
                  }
               }
               else if (texImage->_BaseFormat == GL_LUMINANCE) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba_uint[col][GCOMP] = 0;
                     rgba_uint[col][BCOMP] = 0;
@@ -362,14 +362,14 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint 
dimensions,
                  }
               }
               else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba_uint[col][GCOMP] = 0;
                     rgba_uint[col][BCOMP] = 0;
                  }
               }
               else if (texImage->_BaseFormat == GL_INTENSITY) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba_uint[col][GCOMP] = 0;
                     rgba_uint[col][BCOMP] = 0;
@@ -383,7 +383,7 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint 
dimensions,
               _mesa_unpack_rgba_row(texFormat, width, src, rgba);
 
               if (texImage->_BaseFormat == GL_ALPHA) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba[col][RCOMP] = 0.0F;
                     rgba[col][GCOMP] = 0.0F;
@@ -391,7 +391,7 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint 
dimensions,
                  }
               }
               else if (texImage->_BaseFormat == GL_LUMINANCE) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba[col][GCOMP] = 0.0F;
                     rgba[col][BCOMP] = 0.0F;
@@ -399,14 +399,14 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint 
dimensions,
                  }
               }
               else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba[col][GCOMP] = 0.0F;
                     rgba[col][BCOMP] = 0.0F;
                  }
               }
               else if (texImage->_BaseFormat == GL_INTENSITY) {
-                 GLint col;
+                 GLuint col;
                  for (col = 0; col < width; col++) {
                     rgba[col][GCOMP] = 0.0F;
                     rgba[col][BCOMP] = 0.0F;

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to