summaryrefslogtreecommitdiff
path: root/render/picturestr.h
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-10-08 17:20:33 +0200
committerKeith Packard <keithp@keithp.com>2014-10-23 14:35:49 -0700
commit462bf87c4d1c2211dd49a5ce62d01ff84ff33970 (patch)
tree397fba28721adaf3a3c4469a589d59072516bffb /render/picturestr.h
parent3f4edd2e3ff84c38df563b09c2e8c32404db38f7 (diff)
render: Always store client clip as a region
This does have one semantic change. FixesCreateRegionFromPicture used to throw BadImplementation if you tried to create a region from a picture with no client clip. I changed that to BadMatch here since that more honestly describes what's going on. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'render/picturestr.h')
-rw-r--r--render/picturestr.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/render/picturestr.h b/render/picturestr.h
index 1278f620a..177f87b80 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -132,7 +132,6 @@ typedef struct _Picture {
unsigned int polyEdge:1;
unsigned int polyMode:1;
unsigned int freeCompClip:1;
- unsigned int clientClipType:2;
unsigned int componentAlpha:1;
unsigned int repeatType:2;
unsigned int filter:3;
@@ -145,7 +144,7 @@ typedef struct _Picture {
DDXPointRec alphaOrigin;
DDXPointRec clipOrigin;
- void *clientClip;
+ RegionPtr clientClip;
unsigned long serialNumber;