commit c5c7130385b1b0d35b52a6df68d9558a92fabd86
author Michal Krol <michal@tungstengraphics.com> Thu Aug 07 16:23:15 2008 +0200
committer Michal Krol <michal@tungstengraphics.com> Thu Aug 07 16:23:15 2008 +0200
tree 63f68b733421991f84952d3ff7a9f3e33348a71c
parent d50d7a54de89e602a9951264878dfe06924e1adb

mesa: Silence compiler warnings on Windows.

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index c2c58ff..2b5d5ec 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1493,7 +1493,7 @@
       return;
    }
 
-   if (index + offset > program->Parameters->Size) {
+   if (index + offset > (GLint) program->Parameters->Size) {
       /* out of bounds! */
       return;
    }
@@ -1557,7 +1557,7 @@
          /* if the uniform is bool-valued, convert to 1.0 or 0.0 */
          if (is_boolean_type(program->Parameters->Parameters[index].DataType)) {
             for (i = 0; i < elems; i++) {
-               uniformVal[i] = uniformVal[i] ? 1.0 : 0.0;
+               uniformVal[i] = uniformVal[i] ? 1.0f : 0.0f;
             }
          }
       }

src/mesa/shader/slang/slang_link.c

diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 8f07406..d96380e 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -296,7 +296,7 @@
                maxIndex = inst->SrcReg[j].Index;
          }
          if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-            if (maxIndex < inst->DstReg.Index)
+            if (maxIndex < (GLint) inst->DstReg.Index)
                maxIndex = inst->DstReg.Index;
          }
       }