diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-07-16 07:19:03 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-07-16 07:19:03 +0100 |
| commit | 34ada63118680bf8ad2ef737fd4a8edfd8246e37 (patch) | |
| tree | a6dea74238aecfff674595b0f404389cb6614ad9 /src/sna/sna_render.c | |
| parent | 4422b1854209a2cdf023c1fbc60834fde2fbc0c7 (diff) | |
sna/gen2+: Remove assertion on draw->type for fills
I overlooked the tiling-fill path passing down a temporary DrawableRec
into the fill_boxes callback - invalidating the assertion.
Fixes regression from
commit 43176b9bfafe389c4b9ed676f4e50e3b06f858c4
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jun 30 21:01:11 2014 +0100
sna/dri2: Pass around the correct DrawableRec for sampling from the foriegn bo
Reported-by: Jiri Slaby <jirislaby@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70461#c62
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_render.c')
| -rw-r--r-- | src/sna/sna_render.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index 89be5a58..02001025 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -2181,7 +2181,6 @@ sna_render_copy_boxes__overlap(struct sna *sna, uint8_t alu, pixman_box16_t stack_boxes[64], *boxes = stack_boxes; int num_boxes, i; - assert(draw->type == DRAWABLE_PIXMAP); DBG(("%s: pixmap=%ld, handle=%d, %d x [(%d, %d), (%d, %d)], dst=(%d, %d), src=(%d, %d)\n", __FUNCTION__, draw->serialNumber, bo->handle, n, extents->x1, extents->y1, extents->x2, extents->y2, |