mesa: Use appropriate unsigned/signed, float/integer types.

diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index fb7809ed221427622d676474431d515842f7f893..9f3aa00aff34429c9034e18569c5a43904fcabbd 100644 (file)
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -164,8 +164,8 @@ mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
 {
    struct mem_block *p;
    const int mask = (1 << align2)-1;
-   unsigned int startofs = 0;
-   unsigned int endofs;
+   int startofs = 0;
+   int endofs;
 
    if (!heap || align2 < 0 || size <= 0)
       return NULL;

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 2932c9ebc50232706a5df0d500832738f3a6dfeb..55f862a392c88f408703d06304ade5b2abafe087 100644 (file)
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -513,7 +513,7 @@ _mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)
    for (i = 0; i < prog->NumInstructions; i++) {
       struct prog_instruction *inst = prog->Instructions + i;
       if (inst->BranchTarget > 0) {
-         if (inst->BranchTarget >= start) {
+         if ((GLuint)inst->BranchTarget >= start) {
             inst->BranchTarget += count;
          }
       }