mesa: Fix compiler warnings on Windows.
authorMichal Krol <michal@tungstengraphics.com>
Wed, 1 Oct 2008 17:36:04 +0000 (19:36 +0200)
committerZack Rusin <zack@tungstengraphics.com>
Thu, 2 Oct 2008 14:19:48 +0000 (10:19 -0400)
src/mesa/shader/arbprogparse.c
src/mesa/shader/slang/slang_link.c

index 983f61a653b39c49050d4daddf1d493dc032725e..448251b223dc59e12fbe1a0c140ceba3bb6d5664 100644 (file)
@@ -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;
index d884be2a75df805fe23d39484409f57e5f737065..00e8953768552eb3d683d4777fa28720149ff481 100644 (file)
@@ -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) {