diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-02-22 17:22:10 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-02-22 17:22:54 -0700 |
| commit | e9276efafe43219d7af548ce7f5d2440e19836b0 (patch) | |
| tree | 2b54f1000494c3b216181c927b1a29b77cec9151 /src | |
| parent | c74900ee5d80c7c2b7cbe4ed87395526a742a13e (diff) | |
gallium: fix bug in which wide point stage overrode the aapoint stage
Also, simplify the logic a bit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_validate.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/draw/draw_validate.c b/src/gallium/auxiliary/draw/draw_validate.c index efd6793f2bb..3a19dd4cd78 100644 --- a/src/gallium/auxiliary/draw/draw_validate.c +++ b/src/gallium/auxiliary/draw/draw_validate.c @@ -45,6 +45,7 @@ static struct draw_stage *validate_pipeline( struct draw_stage *stage ) struct draw_stage *next = draw->pipeline.rasterize; int need_det = 0; int precalc_flat = 0; + boolean wide_lines, wide_points; /* Set the validate's next stage to the rasterize stage, so that it * can be found later if needed for flushing. @@ -68,9 +69,18 @@ static struct draw_stage *validate_pipeline( struct draw_stage *stage ) next = draw->pipeline.aapoint; } - if ((draw->rasterizer->line_width != 1.0 && draw->convert_wide_lines - && !draw->rasterizer->line_smooth) || - (draw->rasterizer->point_size != 1.0 && draw->convert_wide_points) || + /* drawing wide lines? */ + wide_lines = (draw->rasterizer->line_width != 1.0 + && draw->convert_wide_lines + && !draw->rasterizer->line_smooth); + + /* drawing large points? */ + wide_points = (draw->rasterizer->point_size != 1.0 + && draw->convert_wide_points + && !draw->pipeline.aapoint); + + if (wide_lines || + wide_points || draw->rasterizer->point_sprite) { draw->pipeline.wide->next = next; next = draw->pipeline.wide; |