diff options
| author | Michal Krol <michal@tungstengraphics.com> | 2008-10-01 19:36:04 +0200 |
|---|---|---|
| committer | Michal Krol <michal@tungstengraphics.com> | 2008-10-01 19:36:04 +0200 |
| commit | 266c5f5ccb3200c1fa195653d53748410078eac7 (patch) | |
| tree | c00a47f2908eed23cd02f48e6168fd6f82bb259f /src/mesa | |
| parent | a6ff215777da2181d7099284f2da28eff78273a9 (diff) | |
mesa: Fix compiler warnings on Windows.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 2 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_link.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index 466ae48bef..34350ac4f3 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -2609,7 +2609,7 @@ parse_src_reg (GLcontext * ctx, const GLubyte ** inst, /* If we're referencing the Program->Parameters[] array, check if the * parameter is really a constant/literal. If so, set File to CONSTANT. */ - assert(*Index < Program->Base.Parameters->NumParameters); + assert(*Index < (GLint) Program->Base.Parameters->NumParameters); file = Program->Base.Parameters->Parameters[*Index].Type; if (file == PROGRAM_CONSTANT) *File = PROGRAM_CONSTANT; diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c index dd7d5be6d8..202080d9d4 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -408,7 +408,7 @@ _slang_update_inputs_outputs(struct gl_program *prog) } } else if (inst->SrcReg[j].File == PROGRAM_ADDRESS) { - maxAddrReg = MAX2(maxAddrReg, inst->SrcReg[j].Index + 1); + maxAddrReg = MAX2(maxAddrReg, (GLuint) (inst->SrcReg[j].Index + 1)); } } if (inst->DstReg.File == PROGRAM_OUTPUT) { |