From: Michal Krol <michal@tungstengraphics.com>
Date: Wed, 20 Feb 2008 21:05:52 +0000 (+0100)
Subject: gallium: Silence compiler warnings on Windows.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69a7c9739bc0f11e66e11ab410d813fa69fe5fc9;p=mesa.git

gallium: Silence compiler warnings on Windows.
---

diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c
index 43d5085895f..0ced585c7f3 100644
--- a/src/gallium/drivers/softpipe/sp_tex_sample.c
+++ b/src/gallium/drivers/softpipe/sp_tex_sample.c
@@ -343,7 +343,7 @@ nearest_texcoord_unnorm(unsigned wrapMode, float s, unsigned size)
    switch (wrapMode) {
    case PIPE_TEX_WRAP_CLAMP:
       i = ifloor(s);
-      return CLAMP(i, 0, size-1);
+      return CLAMP(i, 0, (int) size-1);
    case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
       /* fall-through */
    case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
@@ -366,7 +366,7 @@ linear_texcoord_unnorm(unsigned wrapMode, float s, unsigned size,
    switch (wrapMode) {
    case PIPE_TEX_WRAP_CLAMP:
       /* Not exactly what the spec says, but it matches NVIDIA output */
-      s = CLAMP(s - 0.5F, 0.0, (float) size - 1.0);
+      s = CLAMP(s - 0.5F, 0.0f, (float) size - 1.0f);
       *i0 = ifloor(s);
       *i1 = *i0 + 1;
       break;
@@ -377,7 +377,7 @@ linear_texcoord_unnorm(unsigned wrapMode, float s, unsigned size,
       s -= 0.5F;
       *i0 = ifloor(s);
       *i1 = *i0 + 1;
-      if (*i1 > size - 1)
+      if (*i1 > (int) size - 1)
          *i1 = size - 1;
       break;
    default: