summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/draw
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-12-15 11:22:19 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2008-12-15 11:22:19 +0000
commit8abc860bd46a6cd584f9a64cb4613be76f82db06 (patch)
tree25b94d69e8ef1198cd45b2d5fc0a6fde196124de /src/gallium/auxiliary/draw
parenta22d865f93a1db7f72e0bfe216810f67bf4c2f2c (diff)
parent3a5d260cb1d2602b9fc32392f18538d0a6ff41c2 (diff)
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts: src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/gallium/auxiliary/draw')
-rw-r--r--src/gallium/auxiliary/draw/draw_pipe_offset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_offset.c b/src/gallium/auxiliary/draw/draw_pipe_offset.c
index 8ddc4ee617..62c31532d0 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_offset.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_offset.c
@@ -123,7 +123,7 @@ static void offset_first_tri( struct draw_stage *stage,
{
struct offset_stage *offset = offset_stage(stage);
- offset->units = stage->draw->rasterizer->offset_units * stage->draw->mrd;
+ offset->units = (float) (stage->draw->rasterizer->offset_units * stage->draw->mrd);
offset->scale = stage->draw->rasterizer->offset_scale;
stage->tri = offset_tri;