summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-12-26 14:45:42 -0700
committerBrian Paul <brianp@vmware.com>2011-12-26 15:22:26 -0700
commit62f2d6ef034559257e01235c3562d821bdade4f5 (patch)
treefc0ce4801331f5fe2888891ced22c4a0b49ad6d6 /src/mesa/main
parent0a7602b938893e1b04a01ca8680376cbeec053ab (diff)
mesa: fix signed/unsigned comparison warnings
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/uniform_query.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 33ba53c2e7b..f3d6a16eef9 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);