diff options
| author | michal <michal@michal-laptop.(none)> | 2007-08-21 20:45:09 +0100 |
|---|---|---|
| committer | michal <michal@michal-laptop.(none)> | 2007-08-21 20:45:09 +0100 |
| commit | eb51761b825018bf89080855d0fa3fcb84b9c215 (patch) | |
| tree | 4cac8c810e85abaa940528793fd7e261f7cd6130 | |
| parent | 044c19e6b347d13df70dbc9980cec8a464afe214 (diff) | |
Silence compiler warnings.
| -rw-r--r-- | src/mesa/pipe/draw/draw_clip.c | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/draw/draw_twoside.c | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_clear.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/pipe/draw/draw_clip.c b/src/mesa/pipe/draw/draw_clip.c index 90bfb61568..7e5ceacdfe 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 045109dae0..d7d993841b 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 caa6ac1c84..2d5344f424 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?? */ |