xf86-video-intel: 2 commits - src/sna/gen7_render.c
Chris Wilson
ickle at kemper.freedesktop.org
Sat Jul 14 13:27:03 PDT 2012
src/sna/gen7_render.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit db1ee13a53b0c1348b7566ee60ee1b7b384ef59a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Jul 14 21:26:01 2012 +0100
sna/gen7: Check for gradient allocation failure within spans
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index c06980d..1e10cb0 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -3185,13 +3185,12 @@ gen7_render_composite_spans(struct sna *sna,
break;
}
- tmp->base.mask.bo = NULL;
-
tmp->base.is_affine = tmp->base.src.is_affine;
tmp->base.has_component_alpha = false;
tmp->base.need_magic_ca_pass = false;
- gen7_composite_alpha_gradient_init(sna, &tmp->base.mask);
+ if (!gen7_composite_alpha_gradient_init(sna, &tmp->base.mask))
+ goto cleanup_src;
tmp->prim_emit = gen7_emit_composite_spans_primitive;
if (tmp->base.src.is_solid) {
commit 86479e97460da798a3804cbb4ae39e62de881af1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Jul 14 21:24:04 2012 +0100
sna/gen7: Uses EXTEND_PAD for its alpha-gradient with spans
Fixes regression from 2b94f9a043.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 589c594..c06980d 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2874,8 +2874,6 @@ gen7_composite_alpha_gradient_init(struct sna *sna,
{
DBG(("%s\n", __FUNCTION__));
- channel->filter = PictFilterNearest;
- channel->repeat = RepeatPad;
channel->is_affine = true;
channel->is_solid = false;
channel->transform = NULL;
@@ -3222,7 +3220,7 @@ gen7_render_composite_spans(struct sna *sna,
tmp->base.u.gen7.sampler = SAMPLER_OFFSET(tmp->base.src.filter,
tmp->base.src.repeat,
SAMPLER_FILTER_NEAREST,
- SAMPLER_EXTEND_NONE);
+ SAMPLER_EXTEND_PAD);
tmp->box = gen7_render_composite_spans_box;
tmp->boxes = gen7_render_composite_spans_boxes;
More information about the xorg-commit
mailing list