fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix broken polygon stippling (see comments for details).

Browse source
This commit is contained in:
Brian 2007-10-16 17:37:46 -06:00
parent 0edd490a96
commit bd35c53143
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/mesa/pipe/softpipe/sp_quad_stipple.c
View file

@ -16,18 +16,40 @@
static void
stipple_quad(struct quad_stage *qs, struct quad_header *quad)
{
static const uint bit31 = 1 << 31;
static const uint bit30 = 1 << 30;
if (quad->prim == PRIM_TRI) {
struct softpipe_context *softpipe = qs->softpipe;
const int col0 = quad->x0 % 32;
const int row0 = quad->y0 % 32;
const unsigned stipple0 = softpipe->poly_stipple.stipple[row0];
const unsigned stipple1 = softpipe->poly_stipple.stipple[row0 + 1];
/* need to invert Y to index into OpenGL's stipple pattern */
const int y0 = softpipe->framebuffer.cbufs[0]->height - 1 - quad->y0;
const int y1 = y0 - 1;
const unsigned stipple0 = softpipe->poly_stipple.stipple[y0 % 32];
const unsigned stipple1 = softpipe->poly_stipple.stipple[y1 % 32];
/* XXX there may be a better way to lay out the stored stipple
* values to further simplify this computation.
#if 1
const int col0 = quad->x0 % 32;
if ((stipple0 & (bit31 >> col0)) == 0)
quad->mask &= ~MASK_TOP_LEFT;
if ((stipple0 & (bit30 >> col0)) == 0)
quad->mask &= ~MASK_TOP_RIGHT;
if ((stipple1 & (bit31 >> col0)) == 0)
quad->mask &= ~MASK_BOTTOM_LEFT;
if ((stipple1 & (bit30 >> col0)) == 0)
quad->mask &= ~MASK_BOTTOM_RIGHT;
#else
/* We'd like to use this code, but we'd need to redefine
* MASK_TOP_LEFT to be (1 << 1) and MASK_TOP_RIGHT to be (1 << 0),
* and similarly for the BOTTOM bits. But that may have undesirable
* side effects elsewhere.
*/
const int col0 = 30 - (quad->x0 % 32);
quad->mask &= (((stipple0 >> col0) & 0x3) |
(((stipple1 >> col0) & 0x3) << 2));
#endif
if (quad->mask)
qs->next->run(qs->next, quad);