Mesa (gallium-0.1): mesa: Fix compiler warnings on Windows.

[Michał Król]

Module: Mesa
Branch: gallium-0.1
Commit: 266c5f5ccb3200c1fa195653d53748410078eac7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=266c5f5ccb3200c1fa195653d53748410078eac7

Author: Michal Krol <michal at tungstengraphics.com>
Date:   Wed Oct  1 19:36:04 2008 +0200

mesa: Fix compiler warnings on Windows.

---

 src/mesa/shader/arbprogparse.c     |    2 +-
 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 466ae48..34350ac 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 dd7d5be..202080d 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) {