Mesa (master): mesa: fix signed/unsigned comparison warnings

Brian Paul brianp at kemper.freedesktop.org
Mon Dec 26 15:06:37 PST 2011


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Dec 26 14:45:42 2011 -0700

mesa: fix signed/unsigned comparison warnings

---

 src/mesa/main/uniform_query.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 33ba53c..f3d6a16 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -648,7 +648,7 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
       if (offset >= uni->array_elements)
 	 return;
 
-      count = MIN2(count, (uni->array_elements - offset));
+      count = MIN2(count, (int) (uni->array_elements - offset));
    }
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
@@ -797,7 +797,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
       if (offset >= uni->array_elements)
 	 return;
 
-      count = MIN2(count, (uni->array_elements - offset));
+      count = MIN2(count, (int) (uni->array_elements - offset));
    }
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);



More information about the mesa-commit mailing list