xf86-video-intel: 2 commits - src/sna/sna_trapezoids.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Mar 16 03:07:02 PDT 2012
src/sna/sna_trapezoids.c | 145 +++++++++++++----------------------------------
1 file changed, 42 insertions(+), 103 deletions(-)
New commits:
commit cb04cf9f4395c258987faead80de5c3a2c93082e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Mar 16 09:28:24 2012 +0000
sna/traps: Make the inline u8 arithmetic more robust
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index dca9d1f..c1d42a7 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -3553,6 +3553,19 @@ struct inplace {
uint8_t opacity;
};
+static inline uint8_t
+mul_8_8(uint8_t a, uint8_t b)
+{
+ uint16_t t = a * (uint16_t)b + 0x7f;
+ return ((t >> 8) + t) >> 8;
+}
+
+static uint8_t coverage_opacity(int coverage, uint8_t opacity)
+{
+ coverage = coverage * 256 / FAST_SAMPLES_XY;
+ return mul_8_8(coverage - (coverage >> 8), opacity);
+}
+
static void
tor_blt_src(struct sna *sna,
struct sna_composite_spans_op *op,
@@ -3564,7 +3577,7 @@ tor_blt_src(struct sna *sna,
uint8_t *ptr = in->ptr;
int h, w;
- coverage = coverage * in->opacity / FAST_SAMPLES_XY;
+ coverage = coverage_opacity(coverage, in->opacity);
ptr += box->y1 * in->stride + box->x1;
@@ -3613,19 +3626,22 @@ tor_blt_in(struct sna *sna,
uint8_t *ptr = in->ptr;
int h, w, i;
- coverage = coverage * in->opacity / FAST_SAMPLES_XY;
if (coverage == 0) {
tor_blt_src(sna, op, clip, box, 0);
return;
}
+ coverage = coverage_opacity(coverage, in->opacity);
+ if (coverage == 0xff)
+ return;
+
ptr += box->y1 * in->stride + box->x1;
h = box->y2 - box->y1;
w = box->x2 - box->x1;
do {
for (i = 0; i < w; i++)
- ptr[i] = (ptr[i] * coverage) >> 8;
+ ptr[i] = mul_8_8(ptr[i], coverage);
ptr += in->stride;
} while (--h);
}
@@ -3660,10 +3676,15 @@ tor_blt_add(struct sna *sna,
uint8_t *ptr = in->ptr;
int h, w, v, i;
- coverage = coverage * in->opacity / FAST_SAMPLES_XY;
if (coverage == 0)
return;
+ coverage = coverage_opacity(coverage, in->opacity);
+ if (coverage == 0xff) {
+ tor_blt_src(sna, op, clip, box, 0xff);
+ return;
+ }
+
ptr += box->y1 * in->stride + box->x1;
h = box->y2 - box->y1;
@@ -4057,10 +4078,14 @@ trapezoid_span_inplace(CARD8 op, PicturePtr src, PicturePtr dst,
case PictOpAdd:
if (priv->clear && priv->clear_color == 0)
op = PictOpSrc;
+ if ((color >> 24) == 0)
+ return true;
break;
case PictOpIn:
if (priv->clear && priv->clear_color == 0)
return true;
+ if ((color >> 24) == 0)
+ return true;
case PictOpSrc:
break;
default:
commit d55bbdf42c75eb0fdb634e963ce81953583964b9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Mar 16 09:18:29 2012 +0000
sna/traps: Remove the old paths for mono inplace traps
Dead code elimination.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 907ece0..dca9d1f 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -3603,28 +3603,6 @@ tor_blt_src_clipped(struct sna *sna,
}
static void
-tor_blt_src_mono(struct sna *sna,
- struct sna_composite_spans_op *op,
- pixman_region16_t *clip,
- const BoxRec *box,
- int coverage)
-{
- tor_blt_src(sna, op, clip, box,
- coverage < FAST_SAMPLES_XY/2 ? 0 : FAST_SAMPLES_XY);
-}
-
-static void
-tor_blt_src_clipped_mono(struct sna *sna,
- struct sna_composite_spans_op *op,
- pixman_region16_t *clip,
- const BoxRec *box,
- int coverage)
-{
- tor_blt_src_clipped(sna, op, clip, box,
- coverage < FAST_SAMPLES_XY/2 ? 0 : FAST_SAMPLES_XY);
-}
-
-static void
tor_blt_in(struct sna *sna,
struct sna_composite_spans_op *op,
pixman_region16_t *clip,
@@ -3672,28 +3650,6 @@ tor_blt_in_clipped(struct sna *sna,
}
static void
-tor_blt_in_mono(struct sna *sna,
- struct sna_composite_spans_op *op,
- pixman_region16_t *clip,
- const BoxRec *box,
- int coverage)
-{
- tor_blt_in(sna, op, clip, box,
- coverage < FAST_SAMPLES_XY/2 ? 0 : FAST_SAMPLES_XY);
-}
-
-static void
-tor_blt_in_clipped_mono(struct sna *sna,
- struct sna_composite_spans_op *op,
- pixman_region16_t *clip,
- const BoxRec *box,
- int coverage)
-{
- tor_blt_in_clipped(sna, op, clip, box,
- coverage < FAST_SAMPLES_XY/2 ? 0 : FAST_SAMPLES_XY);
-}
-
-static void
tor_blt_add(struct sna *sna,
struct sna_composite_spans_op *op,
pixman_region16_t *clip,
@@ -3745,28 +3701,6 @@ tor_blt_add_clipped(struct sna *sna,
pixman_region_fini(®ion);
}
-static void
-tor_blt_add_mono(struct sna *sna,
- struct sna_composite_spans_op *op,
- pixman_region16_t *clip,
- const BoxRec *box,
- int coverage)
-{
- if (coverage >= FAST_SAMPLES_XY/2)
- tor_blt_add(sna, op, clip, box, FAST_SAMPLES_XY);
-}
-
-static void
-tor_blt_add_clipped_mono(struct sna *sna,
- struct sna_composite_spans_op *op,
- pixman_region16_t *clip,
- const BoxRec *box,
- int coverage)
-{
- if (coverage >= FAST_SAMPLES_XY/2)
- tor_blt_add_clipped(sna, op, clip, box, FAST_SAMPLES_XY);
-}
-
struct mono_inplace_composite {
pixman_image_t *src, *dst;
int dx, dy;
@@ -4196,41 +4130,21 @@ trapezoid_span_inplace(CARD8 op, PicturePtr src, PicturePtr dst,
}
if (op == PictOpSrc) {
- if (dst->pCompositeClip->data) {
- if (maskFormat ? maskFormat->depth < 8 : dst->polyEdge == PolyEdgeSharp)
- span = tor_blt_src_clipped_mono;
- else
- span = tor_blt_src_clipped;
- } else {
- if (maskFormat ? maskFormat->depth < 8 : dst->polyEdge == PolyEdgeSharp)
- span = tor_blt_src_mono;
- else
- span = tor_blt_src;
- }
+ if (dst->pCompositeClip->data)
+ span = tor_blt_src_clipped;
+ else
+ span = tor_blt_src;
} else if (op == PictOpIn) {
- if (dst->pCompositeClip->data) {
- if (maskFormat ? maskFormat->depth < 8 : dst->polyEdge == PolyEdgeSharp)
- span = tor_blt_in_clipped_mono;
- else
- span = tor_blt_in_clipped;
- } else {
- if (maskFormat ? maskFormat->depth < 8 : dst->polyEdge == PolyEdgeSharp)
- span = tor_blt_in_mono;
- else
- span = tor_blt_in;
- }
+ if (dst->pCompositeClip->data)
+ span = tor_blt_in_clipped;
+ else
+ span = tor_blt_in;
} else {
- if (dst->pCompositeClip->data) {
- if (maskFormat ? maskFormat->depth < 8 : dst->polyEdge == PolyEdgeSharp)
- span = tor_blt_add_clipped_mono;
- else
- span = tor_blt_add_clipped;
- } else {
- if (maskFormat ? maskFormat->depth < 8 : dst->polyEdge == PolyEdgeSharp)
- span = tor_blt_add_mono;
- else
- span = tor_blt_add;
- }
+ assert(op == PictOpAdd);
+ if (dst->pCompositeClip->data)
+ span = tor_blt_add_clipped;
+ else
+ span = tor_blt_add;
}
DBG(("%s: move-to-cpu\n", __FUNCTION__));
More information about the xorg-commit
mailing list