frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand macros that are used only in miFillPolyHelper. 

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Jamey Sharp 2010-05-08 12:18:37 -07:00
parent 946f664b6a
commit 4272d6722c
2 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mi/miwideline.c
View File

@ -138,8 +138,31 @@ miFillPolyHelper (DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel,
while ((left_count || left_height) && while ((left_count || left_height) &&
(right_count || right_height)) (right_count || right_height))
{ {
MIPOLYRELOADLEFT if (!left_height && left_count)
MIPOLYRELOADRIGHT {
left_height = left->height;
left_x = left->x;
left_stepx = left->stepx;
left_signdx = left->signdx;
left_e = left->e;
left_dy = left->dy;
left_dx = left->dx;
--left_count;
++left;
}
if (!right_height && right_count)
{
right_height = right->height;
right_x = right->x;
right_stepx = right->stepx;
right_signdx = right->signdx;
right_e = right->e;
right_dy = right->dy;
right_dx = right->dx;
--right_count;
++right;
}
height = left_height; height = left_height;
if (height > right_height) if (height > right_height)
@ -157,11 +180,23 @@ miFillPolyHelper (DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel,
ppt++; ppt++;
*pwidth++ = right_x - left_x + 1; *pwidth++ = right_x - left_x + 1;
} }
y++; y++;
MIPOLYSTEPLEFT
MIPOLYSTEPRIGHT left_x += left_stepx;
left_e += left_dx;
if (left_e > 0)
{
left_x += left_signdx;
left_e -= left_dy;
}
right_x += right_stepx;
right_e += right_dx;
if (right_e > 0)
{
right_x += right_signdx;
right_e -= right_dy;
}
} }
} }
if (!spanData) if (!spanData)

40
mi/miwideline.h
View File

@ -99,46 +99,6 @@ typedef struct _LineFace {
* macros for polygon fillers * macros for polygon fillers
*/ */
#define MIPOLYRELOADLEFT if (!left_height && left_count) { \
left_height = left->height; \
left_x = left->x; \
left_stepx = left->stepx; \
left_signdx = left->signdx; \
left_e = left->e; \
left_dy = left->dy; \
left_dx = left->dx; \
--left_count; \
++left; \
}
#define MIPOLYRELOADRIGHT if (!right_height && right_count) { \
right_height = right->height; \
right_x = right->x; \
right_stepx = right->stepx; \
right_signdx = right->signdx; \
right_e = right->e; \
right_dy = right->dy; \
right_dx = right->dx; \
--right_count; \
++right; \
}
#define MIPOLYSTEPLEFT left_x += left_stepx; \
left_e += left_dx; \
if (left_e > 0) \
{ \
left_x += left_signdx; \
left_e -= left_dy; \
}
#define MIPOLYSTEPRIGHT right_x += right_stepx; \
right_e += right_dx; \
if (right_e > 0) \
{ \
right_x += right_signdx; \
right_e -= right_dy; \
}
#define MILINESETPIXEL(pDrawable, pGC, pixel, oldPixel) { \ #define MILINESETPIXEL(pDrawable, pGC, pixel, oldPixel) { \
oldPixel = pGC->fgPixel; \ oldPixel = pGC->fgPixel; \
if (pixel != oldPixel) { \ if (pixel != oldPixel) { \