Mesa (main): draw: respect line_rectangular state

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7221f2d6821e28afa3330f7ad7ce176b5b0a9853
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7221f2d6821e28afa3330f7ad7ce176b5b0a9853

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jul  7 23:44:44 2021 +0200

draw: respect line_rectangular state

Now that we have a separate flag to signal rectangular lines, let's use
that instead of the smooth-flag.

This should have the benefit of also drawing rectangular lines when
multisampling stippled, non-smooth lines. But it seems there were no
test for that, so no results to update.

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11782>

---

 src/gallium/auxiliary/draw/draw_pipe_stipple.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pipe_stipple.c b/src/gallium/auxiliary/draw/draw_pipe_stipple.c
index 386b7649e4f..eff9bcf2548 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_stipple.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_stipple.c
@@ -50,7 +50,7 @@ struct stipple_stage {
    float counter;
    ushort pattern;
    ushort factor;
-   bool smooth;
+   bool rectangular;
 };
 
 
@@ -141,7 +141,7 @@ stipple_line(struct draw_stage *stage, struct prim_header *header)
    if (header->flags & DRAW_PIPE_RESET_STIPPLE)
       stipple->counter = 0;
 
-   if (stipple->smooth) {
+   if (stipple->rectangular) {
       float dx = x1 - x0;
       float dy = y1 - y0;
       length = sqrtf(dx*dx + dy*dy);
@@ -216,7 +216,7 @@ stipple_first_line(struct draw_stage *stage,
 
    stipple->pattern = draw->rasterizer->line_stipple_pattern;
    stipple->factor = draw->rasterizer->line_stipple_factor + 1;
-   stipple->smooth = draw->rasterizer->line_smooth;
+   stipple->rectangular = draw->rasterizer->line_rectangular;
 
    stage->line = stipple_line;
    stage->line(stage, header);