diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-10-23 06:36:00 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-10-23 06:36:00 +0000 |
| commit | b65fcab046d3a1b6b6ac315720df220925c5322e (patch) | |
| tree | ff73dcc383ac0799c655ff6194cda9dacb75dde9 /lib/mesa/src/gallium/auxiliary/draw/draw_pipe_validate.c | |
| parent | 18d6381c51e253e4c41c62619f80d9ce745b95c8 (diff) | |
Merge Mesa 17.3.9
Mesa 18.x needs an ld with build-id for at least the intel code
Mesa 18.2 assumes linux only memfd syscalls in intel code
Tested by matthieu@, kettenis@ and myself on a variety of hardware and
architectures. ok kettenis@
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/draw/draw_pipe_validate.c')
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/draw/draw_pipe_validate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_validate.c b/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_validate.c index 01d07593d..846cd4db3 100644 --- a/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_validate.c +++ b/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_validate.c @@ -156,9 +156,10 @@ static struct draw_stage *validate_pipeline( struct draw_stage *stage ) */ stage->next = next; - /* drawing wide lines? */ - wide_lines = (roundf(rast->line_width) > draw->pipeline.wide_line_threshold - && !rast->line_smooth); + /* drawing wide, non-AA lines? */ + wide_lines = rast->line_width != 1.0f && + roundf(rast->line_width) > draw->pipeline.wide_line_threshold && + !rast->line_smooth; /* drawing large/sprite points (but not AA points)? */ if (rast->sprite_coord_enable && draw->pipeline.point_sprite) |