summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-12-04 10:35:04 -0500
committerThomas Hellstrom <thellstrom@vmware.com>2015-01-19 11:23:14 +0100
commit79289b0ffc553ded902eea7b8b9803b098f340e3 (patch)
treebe958dac52148035310988f2cdda8ef0b4c95b3b
parent4664412d7a5266d2b392957406b34abc5db95e48 (diff)
saa: Adapt to GC client clip changes in xserver 1.17
1.17 always stores the client clip as a region, so there's no longer a clientClipType member to look at. Change the code to just inspect whether the clientClip is non-null, since that works both before and after 1.17. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
-rw-r--r--saa/saa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/saa/saa.c b/saa/saa.c
index f2d68e9..be9520e 100644
--- a/saa/saa.c
+++ b/saa/saa.c
@@ -349,7 +349,7 @@ saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC)
{
return ((pGC->alu != GXcopy && pGC->alu != GXclear && pGC->alu != GXset &&
pGC->alu != GXcopyInverted) || pGC->fillStyle == FillStippled ||
- pGC->clientClipType != CT_NONE ||
+ pGC->clientClip != NULL ||
!SAA_PM_IS_SOLID(pDrawable, pGC->planemask));
}