xf86-video-intel: 3 commits - src/sna/gen2_render.c src/sna/gen3_render.c src/sna/gen4_render.c src/sna/gen5_render.c src/sna/gen6_render.c src/sna/gen7_render.c src/sna/gen8_render.c src/sna/sna_blt.c src/sna/sna_composite.c src/sna/sna_render_inline.h
Chris Wilson
ickle at kemper.freedesktop.org
Mon Feb 9 02:43:21 PST 2015
src/sna/gen2_render.c | 6 +-
src/sna/gen3_render.c | 8 +--
src/sna/gen4_render.c | 8 ++-
src/sna/gen5_render.c | 6 +-
src/sna/gen6_render.c | 6 +-
src/sna/gen7_render.c | 7 +-
src/sna/gen8_render.c | 6 +-
src/sna/sna_blt.c | 39 +++++++++++-----
src/sna/sna_composite.c | 104 ++++++++++++++++++++++++--------------------
src/sna/sna_render_inline.h | 6 ++
10 files changed, 115 insertions(+), 81 deletions(-)
New commits:
commit f7f68d50797f0a5e6a3c7f931c827845464acd3f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Feb 9 10:32:48 2015 +0000
sna: Convert pixel values into ARGB values for render operations
When converting from a Pixmap into a Solid, we need to remember to
convert from the stored pixel format into the a8r8g8b8 used by the solid
fill.
This was exposed by
commit aef2f99d051dfa37717e5d6d6de9b548d706a520
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Feb 3 21:31:16 2015 +0000
sna: Convert CompositeRectangles ADD white to SRC white
but is a regression from
commit 31a4c7bc13c5f4560482b450b9ee4788a58930cd [2.99.912]
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Apr 4 10:46:48 2014 +0100
sna/gen2+: Replace composite sources with solids where possible
Reported-by: andrew at atomspring.com
Reported-by: Matti Hämäläinen <ccr at tnsp.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89030
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 1104f46..12b741c 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1572,12 +1572,12 @@ gen2_composite_picture(struct sna *sna,
if (channel->repeat &&
(x >= 0 &&
y >= 0 &&
- x + w < pixmap->drawable.width &&
- y + h < pixmap->drawable.height)) {
+ x + w <= pixmap->drawable.width &&
+ y + h <= pixmap->drawable.height)) {
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv && priv->clear) {
DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
- return gen2_composite_solid_init(sna, channel, priv->clear_color);
+ return gen2_composite_solid_init(sna, channel, solid_color(picture->format, priv->clear_color));
}
}
} else
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 78289f0..a6add06 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -3065,7 +3065,7 @@ gen3_composite_picture(struct sna *sna,
if (sna_picture_is_clear(picture, x, y, w, h, &color)) {
DBG(("%s: clear drawable [%08x]\n", __FUNCTION__, color));
- return gen3_init_solid(channel, color_convert(color, picture->format, PICT_a8r8g8b8));
+ return gen3_init_solid(channel, solid_color(picture->format, color));
}
if (!gen3_check_repeat(picture))
@@ -3097,12 +3097,12 @@ gen3_composite_picture(struct sna *sna,
if (channel->repeat ||
(x >= 0 &&
y >= 0 &&
- x + w < pixmap->drawable.width &&
- y + h < pixmap->drawable.height)) {
+ x + w <= pixmap->drawable.width &&
+ y + h <= pixmap->drawable.height)) {
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv && priv->clear) {
DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
- return gen3_init_solid(channel, priv->clear_color);
+ return gen3_init_solid(channel, solid_color(picture->format, priv->clear_color));
}
}
} else {
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index 6c2d380..89cf07a 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1585,12 +1585,14 @@ gen4_composite_picture(struct sna *sna,
if (channel->repeat &&
(x >= 0 &&
y >= 0 &&
- x + w < pixmap->drawable.width &&
- y + h < pixmap->drawable.height)) {
+ x + w <= pixmap->drawable.width &&
+ y + h <= pixmap->drawable.height)) {
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv && priv->clear) {
DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
- return gen4_channel_init_solid(sna, channel, priv->clear_color);
+ return gen4_channel_init_solid(sna, channel,
+ solid_color(picture->format,
+ priv->clear_color));
}
}
} else
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 37cf1ff..0f9f673 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1524,12 +1524,12 @@ gen5_composite_picture(struct sna *sna,
if (channel->repeat ||
(x >= 0 &&
y >= 0 &&
- x + w < pixmap->drawable.width &&
- y + h < pixmap->drawable.height)) {
+ x + w <= pixmap->drawable.width &&
+ y + h <= pixmap->drawable.height)) {
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv && priv->clear) {
DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
- return gen4_channel_init_solid(sna, channel, priv->clear_color);
+ return gen4_channel_init_solid(sna, channel, solid_color(picture->format, priv->clear_color));
}
}
} else
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 60deccf..973af9d 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1815,12 +1815,12 @@ gen6_composite_picture(struct sna *sna,
if (channel->repeat &&
(x >= 0 &&
y >= 0 &&
- x + w < pixmap->drawable.width &&
- y + h < pixmap->drawable.height)) {
+ x + w <= pixmap->drawable.width &&
+ y + h <= pixmap->drawable.height)) {
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv && priv->clear) {
DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
- return gen4_channel_init_solid(sna, channel, priv->clear_color);
+ return gen4_channel_init_solid(sna, channel, solid_color(picture->format, priv->clear_color));
}
}
} else
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 8d6c6b3..ed5044d 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2048,12 +2048,13 @@ gen7_composite_picture(struct sna *sna,
if (channel->repeat ||
(x >= 0 &&
y >= 0 &&
- x + w < pixmap->drawable.width &&
- y + h < pixmap->drawable.height)) {
+ x + w <= pixmap->drawable.width &&
+ y + h <= pixmap->drawable.height)) {
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv && priv->clear) {
DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
- return gen4_channel_init_solid(sna, channel, priv->clear_color);
+ return gen4_channel_init_solid(sna, channel,
+ solid_color(picture->format, priv->clear_color));
}
}
} else
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index 8a8837b..5f26088 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -1876,12 +1876,12 @@ gen8_composite_picture(struct sna *sna,
if (channel->repeat ||
(x >= 0 &&
y >= 0 &&
- x + w < pixmap->drawable.width &&
- y + h < pixmap->drawable.height)) {
+ x + w <= pixmap->drawable.width &&
+ y + h <= pixmap->drawable.height)) {
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv && priv->clear) {
DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
- return gen4_channel_init_solid(sna, channel, priv->clear_color);
+ return gen4_channel_init_solid(sna, channel, solid_color(picture->format, priv->clear_color));
}
}
} else
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index c9a0228..59b8141 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -2624,24 +2624,20 @@ clear:
op = PictOpSrc;
if (op == PictOpOver) {
color = over(get_solid_color(src, PICT_a8r8g8b8),
- color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
- dst->format, PICT_a8r8g8b8));
+ solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color));
op = PictOpSrc;
DBG(("%s: precomputing solid OVER (%08x, %08x) -> %08x\n",
__FUNCTION__, get_solid_color(src, PICT_a8r8g8b8),
- color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
- dst->format, PICT_a8r8g8b8),
+ solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color),
color));
}
if (op == PictOpAdd) {
color = add(get_solid_color(src, PICT_a8r8g8b8),
- color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
- dst->format, PICT_a8r8g8b8));
+ solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color));
op = PictOpSrc;
DBG(("%s: precomputing solid ADD (%08x, %08x) -> %08x\n",
__FUNCTION__, get_solid_color(src, PICT_a8r8g8b8),
- color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
- dst->format, PICT_a8r8g8b8),
+ solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color),
color));
}
}
@@ -2747,8 +2743,8 @@ fill:
if (is_clear(src_pixmap)) {
if (src->repeat ||
(x >= 0 && y >= 0 &&
- x + width < src_pixmap->drawable.width &&
- y + height < src_pixmap->drawable.height)) {
+ x + width <= src_pixmap->drawable.width &&
+ y + height <= src_pixmap->drawable.height)) {
color = color_convert(sna_pixmap(src_pixmap)->clear_color,
src->format, tmp->dst.format);
goto fill;
diff --git a/src/sna/sna_render_inline.h b/src/sna/sna_render_inline.h
index 10fbbfe..e162e37 100644
--- a/src/sna/sna_render_inline.h
+++ b/src/sna/sna_render_inline.h
@@ -304,6 +304,12 @@ color_convert(uint32_t pixel,
return pixel;
}
+inline static uint32_t
+solid_color(uint32_t format, uint32_t pixel)
+{
+ return color_convert(pixel, format, PICT_a8r8g8b8);
+}
+
inline static bool dst_use_gpu(PixmapPtr pixmap)
{
struct sna_pixmap *priv = sna_pixmap(pixmap);
commit 733a88bda7a654473ffc5961d08ac246ca12a28b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Feb 9 10:24:26 2015 +0000
sna: Tidy composite operator reduction for CompositeRectangles
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 91ba2f2..c6de9d5 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -653,8 +653,9 @@ sna_composite(CARD8 op,
RegionRec region;
int dx, dy;
- DBG(("%s(%d src=%ld+(%d, %d), mask=%ld+(%d, %d), dst=%ld+(%d, %d)+(%d, %d), size=(%d, %d)\n",
- __FUNCTION__, op,
+ DBG(("%s(pixmap=%ld, op=%d, src=%ld+(%d, %d), mask=%ld+(%d, %d), dst=%ld+(%d, %d)+(%d, %d), size=(%d, %d)\n",
+ __FUNCTION__,
+ pixmap->drawable.serialNumber, op,
get_picture_id(src), src_x, src_y,
get_picture_id(mask), mask_x, mask_y,
get_picture_id(dst), dst_x, dst_y,
@@ -797,8 +798,10 @@ sna_composite_rectangles(CARD8 op,
int i, num_boxes;
unsigned hint;
- DBG(("%s(op=%d, %08x x %d [(%d, %d)x(%d, %d) ...])\n",
- __FUNCTION__, op,
+ DBG(("%s(pixmap=%ld, op=%d, %08x x %d [(%d, %d)x(%d, %d) ...])\n",
+ __FUNCTION__,
+ get_drawable_pixmap(dst->pDrawable)->drawable.serialNumber,
+ op,
(color->alpha >> 8 << 24) |
(color->red >> 8 << 16) |
(color->green >> 8 << 8) |
@@ -814,38 +817,40 @@ sna_composite_rectangles(CARD8 op,
return;
}
- if ((color->red|color->green|color->blue|color->alpha) <= 0x00ff) {
- switch (op) {
- case PictOpOver:
- case PictOpOutReverse:
- case PictOpAdd:
- return;
- case PictOpInReverse:
- case PictOpSrc:
- op = PictOpClear;
- break;
- case PictOpAtopReverse:
- op = PictOpOut;
- break;
- case PictOpXor:
- op = PictOpOverReverse;
- break;
- }
- }
if (color->alpha <= 0x00ff) {
- switch (op) {
- case PictOpOver:
- case PictOpOutReverse:
- return;
- case PictOpInReverse:
- op = PictOpClear;
- break;
- case PictOpAtopReverse:
- op = PictOpOut;
- break;
- case PictOpXor:
- op = PictOpOverReverse;
- break;
+ if (PICT_FORMAT_TYPE(dst->format) == PICT_TYPE_A ||
+ (color->red|color->green|color->blue) <= 0x00ff) {
+ switch (op) {
+ case PictOpOver:
+ case PictOpOutReverse:
+ case PictOpAdd:
+ return;
+ case PictOpInReverse:
+ case PictOpSrc:
+ op = PictOpClear;
+ break;
+ case PictOpAtopReverse:
+ op = PictOpOut;
+ break;
+ case PictOpXor:
+ op = PictOpOverReverse;
+ break;
+ }
+ } else {
+ switch (op) {
+ case PictOpOver:
+ case PictOpOutReverse:
+ return;
+ case PictOpInReverse:
+ op = PictOpClear;
+ break;
+ case PictOpAtopReverse:
+ op = PictOpOut;
+ break;
+ case PictOpXor:
+ op = PictOpOverReverse;
+ break;
+ }
}
} else if (color->alpha >= 0xff00) {
switch (op) {
@@ -864,16 +869,15 @@ sna_composite_rectangles(CARD8 op,
op = PictOpOut;
break;
case PictOpAdd:
- if (color->red >= 0xff00 &&
- color->green >= 0xff00 &&
- color->blue >= 0xff00)
+ if (PICT_FORMAT_TYPE(dst->format) == PICT_TYPE_A ||
+ (color->red&color->green&color->blue) >= 0xff00)
op = PictOpSrc;
break;
}
}
/* Avoid reducing overlapping translucent rectangles */
- if (op == PictOpOver &&
+ if ((op == PictOpOver || op == PictOpAdd) &&
num_rects == 1 &&
sna_drawable_is_clear(dst->pDrawable))
op = PictOpSrc;
@@ -985,6 +989,9 @@ sna_composite_rectangles(CARD8 op,
bool ok;
if (op == PictOpClear) {
+ if (priv->clear_color == 0)
+ goto done;
+
ok = sna_get_pixel_from_rgba(&pixel,
0, 0, 0, 0,
dst->format);
@@ -996,8 +1003,11 @@ sna_composite_rectangles(CARD8 op,
color->alpha,
dst->format);
}
- if (ok && priv->clear_color == pixel)
+ if (ok && priv->clear_color == pixel) {
+ DBG(("%s: matches current clear, skipping\n",
+ __FUNCTION__));
goto done;
+ }
}
if (region.data == NULL) {
commit 111847108db7c1c634afca87f1d69589a88a696d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Feb 9 10:23:06 2015 +0000
sna: Match more classes of opaque composite masks
If we apply the mask clipping first, we can be sure that the samples are
all from an untransformed mask and so we can check the is-clear? hint.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index bbba33c..c9a0228 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -920,8 +920,27 @@ sna_composite_mask_is_opaque(PicturePtr mask)
return is_solid(mask) && is_white(mask);
else if (!PICT_FORMAT_A(mask->format))
return true;
- else
- return is_solid(mask) && is_opaque_solid(mask);
+ else if (mask->pSourcePict) {
+ PictSolidFill *fill = (PictSolidFill *) mask->pSourcePict;
+ return (fill->color >> 24) == 0xff;
+ } else {
+ struct sna_pixmap *priv;
+ assert(mask->pDrawable);
+
+ if (mask->pDrawable->width == 1 &&
+ mask->pDrawable->height == 1 &&
+ mask->repeat)
+ return pixel_is_opaque(get_pixel(mask), mask->format);
+
+ if (mask->transform)
+ return false;
+
+ priv = sna_pixmap_from_drawable(mask->pDrawable);
+ if (priv == NULL || !priv->clear)
+ return false;
+
+ return pixel_is_opaque(priv->clear_color, mask->format);
+ }
}
fastcall
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index bad132b..91ba2f2 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -673,13 +673,6 @@ sna_composite(CARD8 op,
src = sna->clear;
}
- if (mask && sna_composite_mask_is_opaque(mask)) {
- DBG(("%s: removing opaque %smask\n",
- __FUNCTION__,
- mask->componentAlpha && PICT_FORMAT_RGB(mask->format) ? "CA " : ""));
- mask = NULL;
- }
-
if (!sna_compute_composite_region(®ion,
src, mask, dst,
src_x, src_y,
@@ -688,6 +681,13 @@ sna_composite(CARD8 op,
width, height))
return;
+ if (mask && sna_composite_mask_is_opaque(mask)) {
+ DBG(("%s: removing opaque %smask\n",
+ __FUNCTION__,
+ mask->componentAlpha && PICT_FORMAT_RGB(mask->format) ? "CA " : ""));
+ mask = NULL;
+ }
+
if (NO_COMPOSITE)
goto fallback;
More information about the xorg-commit
mailing list