diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-06-20 13:31:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-10-27 15:46:05 -0400 |
| commit | 73e2383b7350723256894c5076d0c731aec5cd1f (patch) | |
| tree | 1ceac2d3dbec5820802ce3be12fac72b754cce20 /exa/exa_priv.h | |
| parent | e7b9295551d55b42b416ba70cce11dae79ece5e7 (diff) | |
dix: Always store GC client clip as a region (v2)
Again, this changes FixesCreateRegionFromGC to throw BadMatch when fed a
GC with no client clip.
v2: Fix Xnest and some variable names (Keith)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'exa/exa_priv.h')
| -rw-r--r-- | exa/exa_priv.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/exa/exa_priv.h b/exa/exa_priv.h index 88bfd3772..ca4db720f 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -455,12 +455,11 @@ ExaCheckAddTraps(PicturePtr pPicture, static _X_INLINE Bool exaGCReadsDestination(DrawablePtr pDrawable, unsigned long planemask, unsigned int fillStyle, unsigned char alu, - unsigned int clientClipType) + Bool clientClip) { return ((alu != GXcopy && alu != GXclear && alu != GXset && alu != GXcopyInverted) || fillStyle == FillStippled || - clientClipType != CT_NONE || - !EXA_PM_IS_SOLID(pDrawable, planemask)); + clientClip != FALSE || !EXA_PM_IS_SOLID(pDrawable, planemask)); } void @@ -470,7 +469,7 @@ Bool exaFillRegionTiled(DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile, DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu, - unsigned int clientClipType); + Bool clientClip); void |