From a6eccf9e4f4d4815e004db9c8c61c5cdac63bbfd Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 13 Jul 2007 11:16:13 -0600 Subject: [PATCH] Enable Keith's branch-less stipple code - it works. --- src/mesa/pipe/softpipe/sp_quad_stipple.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/mesa/pipe/softpipe/sp_quad_stipple.c b/src/mesa/pipe/softpipe/sp_quad_stipple.c index 532ffc61b0c..cad1a1400c5 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); -- 2.30.2