Enable Keith's branch-less stipple code - it works.

This commit is contained in:
Brian 2007-07-13 11:16:13 -06:00
parent 80362a90d8
commit a6eccf9e4f

View file

@ -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);