diff options
| author | Brian Paul <[email protected]> | 2010-04-19 08:45:20 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-04-19 08:45:20 -0600 |
| commit | 8f3bdeaad610d7d5a5c6e73e1e9c721219595754 (patch) | |
| tree | 3375ac7eb94edf1914da7faafcedea32a2bd505b /src/gallium/drivers/softpipe/sp_setup.c | |
| parent | f7c2d4fee3104008c21078879cbc5720d7bc1be6 (diff) | |
| parent | e3a34cc7f6c9f959cdc2af4486e84587fab4d0d7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/drivers/llvmpipe/lp_context.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_setup.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/softpipe/sp_setup.c b/src/gallium/drivers/softpipe/sp_setup.c index 7e2b5802ec9..86354664e4b 100644 --- a/src/gallium/drivers/softpipe/sp_setup.c +++ b/src/gallium/drivers/softpipe/sp_setup.c @@ -686,17 +686,17 @@ setup_tri_edges(struct setup_context *setup) setup->emaj.sy = ceilf(vmin_y); setup->emaj.lines = (int) ceilf(vmax_y - setup->emaj.sy); - setup->emaj.dxdy = setup->emaj.dx / setup->emaj.dy; + setup->emaj.dxdy = setup->emaj.dy ? setup->emaj.dx / setup->emaj.dy : .0f; setup->emaj.sx = vmin_x + (setup->emaj.sy - vmin_y) * setup->emaj.dxdy; setup->etop.sy = ceilf(vmid_y); setup->etop.lines = (int) ceilf(vmax_y - setup->etop.sy); - setup->etop.dxdy = setup->etop.dx / setup->etop.dy; + setup->etop.dxdy = setup->etop.dy ? setup->etop.dx / setup->etop.dy : .0f; setup->etop.sx = vmid_x + (setup->etop.sy - vmid_y) * setup->etop.dxdy; setup->ebot.sy = ceilf(vmin_y); setup->ebot.lines = (int) ceilf(vmid_y - setup->ebot.sy); - setup->ebot.dxdy = setup->ebot.dx / setup->ebot.dy; + setup->ebot.dxdy = setup->ebot.dy ? setup->ebot.dx / setup->ebot.dy : .0f; setup->ebot.sx = vmin_x + (setup->ebot.sy - vmin_y) * setup->ebot.dxdy; } |