summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Krol <michal@tungstengraphics.com>2008-02-13 17:51:41 +0100
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-15 11:29:58 +0900
commitd3cd39493c1e776c1e21045920744a27de2787f1 (patch)
tree9431fbcc306bee5c789c3eca98853331d1b67527
parent3f1b712d0a47b440875e58429debd9a145192724 (diff)
gallium: Fix build on Windows.
-rw-r--r--src/mesa/pipe/draw/draw_wide_prims.c2
-rw-r--r--src/mesa/pipe/i915simple/i915_surface.c2
-rw-r--r--src/mesa/pipe/softpipe/sp_surface.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/pipe/draw/draw_wide_prims.c b/src/mesa/pipe/draw/draw_wide_prims.c
index 37b60a6da1..655774b155 100644
--- a/src/mesa/pipe/draw/draw_wide_prims.c
+++ b/src/mesa/pipe/draw/draw_wide_prims.c
@@ -175,7 +175,7 @@ static void wide_line_aa(struct draw_stage *stage,
float *pos;
float dx = header->v[1]->data[0][0] - header->v[0]->data[0][0];
float dy = header->v[1]->data[0][1] - header->v[0]->data[0][1];
- const float len = sqrt(dx * dx + dy * dy);
+ const float len = (float) sqrt(dx * dx + dy * dy);
uint i;
dx = dx * half_width / len;
diff --git a/src/mesa/pipe/i915simple/i915_surface.c b/src/mesa/pipe/i915simple/i915_surface.c
index 6d4b8a0aa9..de0cc5fe06 100644
--- a/src/mesa/pipe/i915simple/i915_surface.c
+++ b/src/mesa/pipe/i915simple/i915_surface.c
@@ -99,7 +99,7 @@ i915_surface_copy(struct pipe_context *pipe,
dstx, dsty,
width, height,
pipe_surface_map(src),
- do_flip ? -src->pitch : src->pitch,
+ do_flip ? -(int) src->pitch : src->pitch,
srcx, do_flip ? 1 - srcy - height : srcy);
pipe_surface_unmap(src);
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index 5c6ed3b8d9..8802ced187 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -54,7 +54,7 @@ sp_surface_copy(struct pipe_context *pipe,
dstx, dsty,
width, height,
pipe_surface_map(src),
- do_flip ? -src->pitch : src->pitch,
+ do_flip ? -(int) src->pitch : src->pitch,
srcx, do_flip ? 1 - srcy - height : srcy);
pipe_surface_unmap(src);