Mesa (master): draw: check for line_width != 1.0f in validate_pipeline()

Brian Paul brianp at kemper.freedesktop.org
Thu Jun 15 20:07:03 UTC 2017


Module: Mesa
Branch: master
Commit: c8f344ed2d471f0e012205aecfae4aa765d9fffb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8f344ed2d471f0e012205aecfae4aa765d9fffb

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jun 15 11:29:38 2017 -0600

draw: check for line_width != 1.0f in validate_pipeline()

We shouldn't use the wide line stage if the line width is 1.
This check isn't strictly needed because all drivers are (now)
specifying a line wide threshold of at least 1.0 pixels, but
let's play it safe.

Reviewed-by: Charmaine Lee <charmainel at vmware.com>

---

 src/gallium/auxiliary/draw/draw_pipe_validate.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pipe_validate.c b/src/gallium/auxiliary/draw/draw_pipe_validate.c
index 01d07593d5..846cd4db39 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_validate.c
+++ b/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)




More information about the mesa-commit mailing list