commit 53174afeeb68a79e471185cb463c13ff90af698f
author José Fonseca <jrfonseca@tungstengraphics.com> Sat May 31 18:14:09 2008 +0900
committer José Fonseca <jrfonseca@tungstengraphics.com> Sat May 31 18:55:40 2008 +0900
tree 9e48b55cda10c585d7a7a5a2423df9c212dfede7
parent 45b2c23d7a2f1bd723d0719b13470125de09c243

mesa: Apply MSVC portability fixes from Alan Hourihane.

src/mesa/shader/prog_execute.c

diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 8ce2ca3..abb143c 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -92,7 +92,7 @@
                 source->File == PROGRAM_CONSTANT ||
                 source->File == PROGRAM_STATE_VAR);
          params = machine->CurProgram->Parameters;
-         if (reg < 0 || reg >= params->NumParameters)
+         if (reg < 0 || reg >= (GLint)params->NumParameters)
             return ZeroVec;
          else
             return params->ParameterValues[reg];
@@ -227,7 +227,7 @@
                     const struct gl_program_machine *machine,
                     char xOrY, GLfloat result[4])
 {
-   if (source->File == PROGRAM_INPUT && source->Index < machine->NumDeriv) {
+   if (source->File == PROGRAM_INPUT && source->Index < (GLint)machine->NumDeriv) {
       const GLint col = machine->CurElement;
       const GLfloat w = machine->Attribs[FRAG_ATTRIB_WPOS][col][3];
       const GLfloat invQ = 1.0f / w;
@@ -506,7 +506,7 @@
 {
    const GLuint numInst = program->NumInstructions;
    const GLuint maxExec = 10000;
-   GLint pc, numExec = 0;
+   GLuint pc, numExec = 0;
 
    machine->CurProgram = program;