diff options
| author | Keith Whitwell <[email protected]> | 2008-09-21 22:30:55 -0700 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-21 22:30:55 -0700 |
| commit | dace236c5fffa29d59e4d12fa865889bbecbdd24 (patch) | |
| tree | ea6a1d6fde371ad9ebbd7f050de8f35860e56213 /src/mesa/shader/program.c | |
| parent | e61793a7c01588f2e6235f1271af4c58fa8adad4 (diff) | |
| parent | 6fd15dd80666ccb1e9b99cedd306e32cc7cee989 (diff) | |
Merge branch 'master' into gallium-0.2
Conflicts:
src/mesa/glapi/glapi.h
src/mesa/main/api_exec.c
src/mesa/main/attrib.c
src/mesa/main/clear.c
src/mesa/main/context.c
src/mesa/main/mfeatures.h
src/mesa/main/mipmap.c
src/mesa/main/mipmap.h
src/mesa/main/readpix.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texformat.c
src/mesa/main/texparam.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_context.c
src/mesa/x86/common_x86_asm.S
Diffstat (limited to 'src/mesa/shader/program.c')
| -rw-r--r-- | src/mesa/shader/program.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c index 6263fd277f8..f120c20bdf2 100644 --- a/src/mesa/shader/program.c +++ b/src/mesa/shader/program.c @@ -517,7 +517,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; } } |