diff options
| author | Michal Krol <michal@tungstengraphics.com> | 2008-10-01 19:36:04 +0200 |
|---|---|---|
| committer | Zack Rusin <zack@tungstengraphics.com> | 2008-10-02 10:19:48 -0400 |
| commit | a77976d2ee578d0483c64f2aa41719bbae9c1c97 (patch) | |
| tree | b4a4fb06466e8279f30e0ae34475d2e3f22bd782 /src/mesa | |
| parent | 8bdb4d2b2fdb12d0ba5249c289d349e35d893d00 (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 983f61a653..448251b223 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -2603,7 +2603,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 d884be2a75..00e8953768 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) { |