xf86-video-intel: src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Oct 13 14:30:46 PDT 2011
src/sna/sna_accel.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 020d84d2d09c71a8209dd774a0735a3c11cb148d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Oct 13 22:32:00 2011 +0100
sna/accel: Fix sense of nothing-to-do due to clipping
A missing not due to a hasty conversion from an assert.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 4926499..1073757 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3174,16 +3174,20 @@ sna_glyph_blt(DrawablePtr drawable, GCPtr gc,
uint8_t rop = transparent ? ROP[gc->alu] : ROP_S;
RegionRec clip;
- if (priv->gpu_bo->tiling == I915_TILING_Y)
+ if (priv->gpu_bo->tiling == I915_TILING_Y) {
+ DBG(("%s -- fallback, dst uses Y-tiling\n", __FUNCTION__));
return false;
+ }
region_set(&clip, extents);
region_maybe_clip(&clip, gc->pCompositeClip);
- if (RegionNotEmpty(&clip))
- return false;
+ if (!RegionNotEmpty(&clip))
+ return true;
/* XXX loop over clips using SETUP_CLIP? */
if (clip.data != NULL) {
+ DBG(("%s -- fallback too many clip rects [%d]\n",
+ __FUNCTION__, REGION_NUM_RECTS(&clip)));
RegionUninit(&clip);
return false;
}
More information about the xorg-commit
mailing list