fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-30 23:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

draw: fix line stippling with aa lines

Browse source 
In contrast to non-aa, where stippling is based on either dx or dy
(depending on if it's a x or y major line), stippling is based on
actual distance with smooth lines, so adjust for this.

(It looks like there's some minor artifacts with mesa demos
line-sample and stippling, it looks like the line endpoints
aren't quite right with aa + stippling - maybe due to the
integer math in the stipple stage, but I can't quite pinpoint it.)

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Roland Scheidegger 2018-03-06 21:33:16 +01:00
parent dbb2cf388b
commit 8ba3750d3d
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/auxiliary/draw/draw_pipe_stipple.c
View file

@ -50,6 +50,7 @@ struct stipple_stage {
float counter;
uint pattern;
uint factor;
bool smooth;
};
@ -133,12 +134,19 @@ stipple_line(struct draw_stage *stage, struct prim_header *header)
float y0 = pos0[1];
float y1 = pos1[1];
float dx = x0 > x1 ? x0 - x1 : x1 - x0;
float dy = y0 > y1 ? y0 - y1 : y1 - y0;
float length = MAX2(dx, dy);
float length;
int i;
if (stipple->smooth) {
float dx = x1 - x0;
float dy = y1 - y0;
length = sqrtf(dx*dx + dy*dy);
} else {
float dx = x0 > x1 ? x0 - x1 : x1 - x0;
float dy = y0 > y1 ? y0 - y1 : y1 - y0;
length = MAX2(dx, dy);
}
if (header->flags & DRAW_PIPE_RESET_STIPPLE)
stipple->counter = 0;
@ -205,6 +213,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;
stage->line = stipple_line;
stage->line(stage, header);