summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-20 10:46:43 -0700
committerKeith Packard <keithp@keithp.com>2010-05-20 14:36:29 -0700
commit5754e66044571d549c295b7c9e02ce3348dbe3c7 (patch)
treed394d8b40e579b0164c5f27ca6e0363f72b57fa5 /include
parent5a7275d78a2f1c20ed5bb7b228cf370c4ada22c9 (diff)
Replace screen->rgf scratch GC flags with a bit in each GC.
This eliminates a poorly-named, poorly-documented field from the ScreenRec, using a previously-unused flag bit in each GC instead. Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Keith Packard <keithp@keithp.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
-rw-r--r--include/gcstruct.h3
-rw-r--r--include/scrnintstr.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gcstruct.h b/include/gcstruct.h
index b9fc5cace..3f70eada4 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -292,7 +292,8 @@ typedef struct _GC {
unsigned int tileIsPixel:1; /* tile is solid pixel */
unsigned int fExpose:1; /* Call exposure handling */
unsigned int freeCompClip:1; /* Free composite clip */
- unsigned int unused:14; /* see comment above */
+ unsigned int scratch_inuse:1; /* is this GC in a pool for reuse? */
+ unsigned int unused:13; /* see comment above */
unsigned long planemask;
unsigned long fgPixel;
unsigned long bgPixel;
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 3a77e0cf1..6f1936c1f 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -455,7 +455,6 @@ typedef struct _Screen {
short minInstalledCmaps, maxInstalledCmaps;
char backingStoreSupport, saveUnderSupport;
unsigned long whitePixel, blackPixel;
- unsigned long rgf; /* array of flags; she's -- HUNGARIAN */
GCPtr GCperDepth[MAXFORMATS+1];
/* next field is a stipple to use as default in
a GC. we don't build default tiles of all depths