diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-06-09 15:30:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-30 12:17:51 +1000 |
| commit | 8218dadd30eb0c87efbac6db5d8e3862a236b6a4 (patch) | |
| tree | d00f9113accd31c0fdd855c4910081344d0dd0d7 /dix | |
| parent | fa12f2c150b2f50de9dac4a2b09265f13af353af (diff) | |
cursor: drop ARGB_CURSOR
I doubt anyone builds with this turned off or has done for a long
time.
It helps my eyes bleed slightly less when reading the code, I've left
the define in place as some drivers use it.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/cursor.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/dix/cursor.c b/dix/cursor.c index 1525857e3..e45945619 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -80,9 +80,7 @@ FreeCursorBits(CursorBitsPtr bits) return; free(bits->source); free(bits->mask); -#ifdef ARGB_CURSOR free(bits->argb); -#endif dixFiniPrivates(bits, PRIVATE_CURSOR_BITS); if (bits->refcnt == 0) { GlyphSharePtr *prev, this; @@ -165,7 +163,6 @@ CheckForEmptyMask(CursorBitsPtr bits) while (n--) if (*(msk++) != 0) return; -#ifdef ARGB_CURSOR if (bits->argb) { CARD32 *argb = bits->argb; @@ -174,7 +171,6 @@ CheckForEmptyMask(CursorBitsPtr bits) if (*argb++ & 0xff000000) return; } -#endif bits->emptyMask = TRUE; } @@ -259,9 +255,7 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits, dixInitPrivates(bits, bits + 1, PRIVATE_CURSOR_BITS) bits->source = psrcbits; bits->mask = pmaskbits; -#ifdef ARGB_CURSOR bits->argb = argb; -#endif bits->width = cm->width; bits->height = cm->height; bits->xhot = cm->xhot; @@ -400,9 +394,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, dixInitPrivates(bits, bits + 1, PRIVATE_CURSOR_BITS); bits->source = srcbits; bits->mask = mskbits; -#ifdef ARGB_CURSOR bits->argb = 0; -#endif bits->width = cm.width; bits->height = cm.height; bits->xhot = cm.xhot; |