From: michal <michal@michal-laptop.(none)>
Date: Tue, 21 Aug 2007 19:45:09 +0000 (+0100)
Subject: Silence compiler warnings.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb51761b825018bf89080855d0fa3fcb84b9c215;p=mesa.git

Silence compiler warnings.
---

diff --git a/src/mesa/pipe/draw/draw_clip.c b/src/mesa/pipe/draw/draw_clip.c
index 90bfb615683..7e5ceacdfea 100644
--- a/src/mesa/pipe/draw/draw_clip.c
+++ b/src/mesa/pipe/draw/draw_clip.c
@@ -116,7 +116,7 @@ static void interp( const struct clipper *clip,
       const float *pos = dst->clip;
       const float *scale = clip->stage.draw->viewport.scale;
       const float *trans = clip->stage.draw->viewport.translate;
-      const float oow = 1.0 / pos[3];
+      const float oow = 1.0f / pos[3];
 
       dst->data[0][0] = pos[0] * oow * scale[0] + trans[0];
       dst->data[0][1] = pos[1] * oow * scale[1] + trans[1];
diff --git a/src/mesa/pipe/draw/draw_twoside.c b/src/mesa/pipe/draw/draw_twoside.c
index 045109dae0b..d7d993841b9 100644
--- a/src/mesa/pipe/draw/draw_twoside.c
+++ b/src/mesa/pipe/draw/draw_twoside.c
@@ -55,7 +55,7 @@ static void twoside_begin( struct draw_stage *stage )
     * if the triangle is back-facing (negative).
     * sign = -1 for CCW, +1 for CW
     */
-   twoside->sign = (stage->draw->setup.front_winding == PIPE_WINDING_CCW) ? -1 : 1;
+   twoside->sign = (stage->draw->setup.front_winding == PIPE_WINDING_CCW) ? -1.0f : 1.0f;
 
    stage->next->begin( stage->next );
 }
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index caa6ac1c84c..2d5344f424b 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -46,7 +46,7 @@ softpipe_clear(struct pipe_context *pipe, struct pipe_surface *ps,
                unsigned clearValue)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
-   int x, y, w, h;
+   unsigned x, y, w, h;
 
    softpipe_update_derived(softpipe); /* not needed?? */