diff options
| author | Brian Paul <brianp@vmware.com> | 2014-02-03 11:33:03 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-02-03 12:50:04 -0700 |
| commit | fc3fcd1e01093e8ab8d06d95c53f875ace57ca7f (patch) | |
| tree | 7a97d7848969029d20605d22521837f8da01c9b8 /src/gallium | |
| parent | 349b76a55364c0bb33daa4e1ebe36dd689e35807 (diff) | |
| download | external_mesa3d-fc3fcd1e01093e8ab8d06d95c53f875ace57ca7f.zip external_mesa3d-fc3fcd1e01093e8ab8d06d95c53f875ace57ca7f.tar.gz external_mesa3d-fc3fcd1e01093e8ab8d06d95c53f875ace57ca7f.tar.bz2 | |
draw: fix incorrect color of flat-shaded clipped lines
When we clipped a line weren't copying the provoking vertex
color to the second vertex. We also weren't checking for
first vs. last provoking vertex.
Fixes failures found with the new piglit line-flat-clip-color test.
Cc: "10.0, 10.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pipe_clip.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_clip.c b/src/gallium/auxiliary/draw/draw_pipe_clip.c index de354e9..d8b56de 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_clip.c +++ b/src/gallium/auxiliary/draw/draw_pipe_clip.c @@ -588,7 +588,12 @@ do_clip_line( struct draw_stage *stage, if (v0->clipmask) { interp( clipper, stage->tmp[0], t0, v0, v1, viewport_index ); - copy_flat(stage, stage->tmp[0], v0); + if (stage->draw->rasterizer->flatshade_first) { + copy_flat(stage, stage->tmp[0], v0); /* copy v0 color to tmp[0] */ + } + else { + copy_flat(stage, stage->tmp[0], v1); /* copy v1 color to tmp[0] */ + } newprim.v[0] = stage->tmp[0]; } else { @@ -597,6 +602,12 @@ do_clip_line( struct draw_stage *stage, if (v1->clipmask) { interp( clipper, stage->tmp[1], t1, v1, v0, viewport_index ); + if (stage->draw->rasterizer->flatshade_first) { + copy_flat(stage, stage->tmp[1], v0); /* copy v0 color to tmp[1] */ + } + else { + copy_flat(stage, stage->tmp[1], v1); /* copy v1 color to tmp[1] */ + } newprim.v[1] = stage->tmp[1]; } else { |