summaryrefslogtreecommitdiff
path: root/src/sna/sna_composite.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-10-30 18:42:06 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-10-30 18:52:14 +0000
commit426efd5f4bb311eeec86de40815b6bc2c6914e94 (patch)
tree0c876c8491664c57ee919d8682459c3c1dac3adf /src/sna/sna_composite.c
parented282456240cc0a7ae9a235ea8aea14a8b8a54ef (diff)
Revert "sna: Detect and handle mi recursion"
This reverts commit c6b0e3fe0c299488932ba0392847f1faf298d079.
Diffstat (limited to 'src/sna/sna_composite.c')
-rw-r--r--src/sna/sna_composite.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 3174639f..c5e2311c 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -541,7 +541,6 @@ sna_composite_fb(CARD8 op,
region->extents.y1 + sy >= 0 &&
region->extents.x2 + sx <= src->pDrawable->width &&
region->extents.y2 + sy <= src->pDrawable->height) {
- sigtrap_assert();
if (sigtrap_get() == 0) {
BoxPtr box = RegionRects(region);
int nbox = RegionNumRects(region);
@@ -594,7 +593,6 @@ sna_composite_fb(CARD8 op,
dest_image = image_from_pict(dst, TRUE, &dst_xoff, &dst_yoff);
if (src_image && dest_image && !(mask && !mask_image)) {
- sigtrap_assert();
if (sigtrap_get() == 0) {
sna_image_composite(op, src_image, mask_image, dest_image,
src_x + src_xoff, src_y + src_yoff,
@@ -748,7 +746,6 @@ fallback:
width, height);
out:
REGION_UNINIT(NULL, &region);
- sigtrap_assert();
}
void
@@ -1083,7 +1080,6 @@ fallback:
assert(pixmap->devPrivate.ptr);
- sigtrap_assert();
if (sigtrap_get() == 0) {
if (op <= PictOpSrc) {
int nbox = RegionNumRects(&region);