dix: Retype and repack GC

LP64: 160 bytes before, 128 after.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2014-02-28 16:35:10 -05:00 committed by Keith Packard
parent 73e2383b73
commit 839f05329d

View File

@ -260,9 +260,9 @@ typedef struct _GC {
unsigned int freeCompClip:1; /* Free composite clip */ unsigned int freeCompClip:1; /* Free composite clip */
unsigned int scratch_inuse:1; /* is this GC in a pool for reuse? */ unsigned int scratch_inuse:1; /* is this GC in a pool for reuse? */
unsigned int unused:15; /* see comment above */ unsigned int unused:15; /* see comment above */
unsigned long planemask; unsigned int planemask;
unsigned long fgPixel; unsigned int fgPixel;
unsigned long bgPixel; unsigned int bgPixel;
/* /*
* alas -- both tile and stipple must be here as they * alas -- both tile and stipple must be here as they
* are independently specifiable * are independently specifiable
@ -270,11 +270,11 @@ typedef struct _GC {
PixUnion tile; PixUnion tile;
PixmapPtr stipple; PixmapPtr stipple;
DDXPointRec patOrg; /* origin for (tile, stipple) */ DDXPointRec patOrg; /* origin for (tile, stipple) */
struct _Font *font;
DDXPointRec clipOrg; DDXPointRec clipOrg;
struct _Font *font;
RegionPtr clientClip; RegionPtr clientClip;
unsigned long stateChanges; /* masked with GC_<kind> */ unsigned int stateChanges; /* masked with GC_<kind> */
unsigned long serialNumber; unsigned int serialNumber;
const GCFuncs *funcs; const GCFuncs *funcs;
const GCOps *ops; const GCOps *ops;
PrivateRec *devPrivates; PrivateRec *devPrivates;