diff options
| author | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-06-24 11:34:46 +0900 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 22:13:56 -0700 |
| commit | 457d7218b8e0f0c21ae31564d25b7031b423b0f8 (patch) | |
| tree | 98d51cb0dc1710f41956bbd01e7bad0e203badc4 /src/mesa | |
| parent | 88f729e4ec145ca388fb20e72d65c51af154d2e5 (diff) | |
mesa: Use appropriate unsigned/signed, float/integer types.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/mm.c | 4 | ||||
| -rw-r--r-- | src/mesa/shader/program.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c index fb7809ed22..9f3aa00aff 100644 --- 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 2932c9ebc5..55f862a392 100644 --- 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; } } |