diff options
author | Brian <brian.paul@tungstengraphics.com> | 2007-07-13 11:16:13 -0600 |
---|---|---|
committer | Brian <brian.paul@tungstengraphics.com> | 2007-07-13 11:16:13 -0600 |
commit | a6eccf9e4f4d4815e004db9c8c61c5cdac63bbfd (patch) | |
tree | 59968525cf0df39cd8285b4146f84cbac5509be6 /src/mesa | |
parent | 80362a90d8ad1fca14d7276169fc962f953d936d (diff) |
Enable Keith's branch-less stipple code - it works.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/pipe/softpipe/sp_quad_stipple.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/mesa/pipe/softpipe/sp_quad_stipple.c b/src/mesa/pipe/softpipe/sp_quad_stipple.c index 532ffc61b0..cad1a1400c 100644 --- a/src/mesa/pipe/softpipe/sp_quad_stipple.c +++ b/src/mesa/pipe/softpipe/sp_quad_stipple.c @@ -24,30 +24,11 @@ stipple_quad(struct quad_stage *qs, struct quad_header *quad) const GLuint stipple0 = softpipe->poly_stipple.stipple[row0]; const GLuint stipple1 = softpipe->poly_stipple.stipple[row0 + 1]; - /* XXX this should be acheivable without conditionals */ -#if 1 - GLbitfield mask = 0x0; - - if ((1 << col0) & stipple0) - mask |= MASK_BOTTOM_LEFT; - - if ((2 << col0) & stipple0) /* note: col0 <= 30 */ - mask |= MASK_BOTTOM_RIGHT; - - if ((1 << col0) & stipple1) - mask |= MASK_TOP_LEFT; - - if ((2 << col0) & stipple1) - mask |= MASK_TOP_RIGHT; - - quad->mask &= mask; -#else /* XXX there may be a better way to lay out the stored stipple * values to further simplify this computation. */ quad->mask &= (((stipple0 >> col0) & 0x3) | (((stipple1 >> col0) & 0x3) << 2)); -#endif if (quad->mask) qs->next->run(qs->next, quad); |