summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/sna/sna_accel.c6
-rw-r--r--src/sna/sna_glyphs.c91
-rw-r--r--src/sna/sna_render.c2
3 files changed, 63 insertions, 36 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index af98301e..c79af6ac 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -817,8 +817,8 @@ create_pixmap(struct sna *sna, ScreenPtr screen,
datasize += adjust;
}
- DBG(("%s: allocating pixmap %dx%d, depth=%d, size=%ld\n",
- __FUNCTION__, width, height, depth, (long)datasize));
+ DBG(("%s: allocating pixmap %dx%d, depth=%d/%d, size=%ld\n",
+ __FUNCTION__, width, height, depth, bpp, (long)datasize));
pixmap = AllocatePixmap(screen, datasize);
if (!pixmap)
return NullPixmap;
@@ -4091,7 +4091,7 @@ sna_pixmap_create_upload(ScreenPtr screen,
assert(width);
assert(height);
- if (depth == 1)
+ if (depth < 8)
return create_pixmap(sna, screen, width, height, depth,
CREATE_PIXMAP_USAGE_SCRATCH);
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 6d57e8fd..9e945f01 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -74,7 +74,7 @@
#define NO_GLYPHS_VIA_MASK 0
#define FORCE_SMALL_MASK 0 /* -1 = never, 1 = always */
#define NO_GLYPHS_SLOW 0
-#define NO_DISCARD_MASK 0
+#define DISCARD_MASK 0 /* -1 = never, 1 = always */
#define CACHE_PICTURE_SIZE 1024
#define GLYPH_MIN_SIZE 8
@@ -1094,6 +1094,9 @@ sna_glyph_get_image(GlyphPtr g, ScreenPtr s)
static inline bool use_small_mask(struct sna *sna, int16_t width, int16_t height, int depth)
{
+ if (depth < 8)
+ return true;
+
if (FORCE_SMALL_MASK)
return FORCE_SMALL_MASK > 0;
@@ -1156,12 +1159,6 @@ glyphs_via_mask(struct sna *sna,
src_x += box.x1 - list->xOff;
src_y += box.y1 - list->yOff;
- if (format->depth < 8) {
- format = PictureMatchFormat(screen, 8, PICT_a8);
- if (!format)
- return false;
- }
-
component_alpha = NeedsComponent(format->format);
if (use_small_mask(sna, width, height, format->depth)) {
pixman_image_t *mask_image;
@@ -1179,7 +1176,7 @@ use_small_mask:
return false;
mask_image =
- pixman_image_create_bits(format->depth << 24 | format->format,
+ pixman_image_create_bits(pixmap->drawable.bitsPerPixel << 24 | format->format,
width, height,
pixmap->devPrivate.ptr,
pixmap->devKind);
@@ -1386,10 +1383,11 @@ next_image:
DBG(("%s: atlas format=%08x, mask format=%08x\n",
__FUNCTION__,
(int)p->atlas->format,
- (int)(format->depth << 24 | format->format)));
+ (int)mask->format));
memset(&tmp, 0, sizeof(tmp));
- if (p->atlas->format == (format->depth << 24 | format->format)) {
+ if (p->atlas->format == mask->format ||
+ alphaless(p->atlas->format) == mask->format) {
ok = sna->render.composite(sna, PictOpAdd,
p->atlas, NULL, mask,
0, 0, 0, 0, 0, 0,
@@ -1564,6 +1562,8 @@ skip_glyph:
out:
if (list_extents != stack_extents)
free(list_extents);
+ DBG(("%s: format=%08d, depth=%d\n",
+ __FUNCTION__, format->format, format->depth));
return format;
}
@@ -1573,24 +1573,34 @@ static bool can_discard_mask(uint8_t op, PicturePtr src, PictFormatPtr mask,
PictFormatPtr g;
uint32_t color;
- if (NO_DISCARD_MASK)
- return false;
+ if (DISCARD_MASK)
+ return DISCARD_MASK > 0;
DBG(("%s: nlist=%d, mask=%08x, depth %d, op=%d (bounded? %d)\n",
__FUNCTION__, nlist,
mask ? (unsigned)mask->format : 0, mask ? mask->depth : 0,
op, op_is_bounded(op)));
- if (nlist == 1 && list->len == 1)
- return true;
+ if (nlist == 1 && list->len == 1) {
+ if (mask == list->format)
+ return true;
+
+ g = list->format;
+ goto skip;
+ }
- if (!op_is_bounded(op))
+ if (!op_is_bounded(op)) {
+ DBG(("%s: unbounded op, not discarding\n", __FUNCTION__));
return false;
+ }
/* No glyphs overlap and we are not performing a mask conversion. */
g = glyphs_format(nlist, list, glyphs);
- if (mask == g)
+ if (mask == g) {
+ DBG(("%s: mask matches glyphs format, no conversion, so discard mask\n",
+ __FUNCTION__));
return true;
+ }
DBG(("%s: preferred mask format %08x, depth %d\n",
__FUNCTION__, g ? (unsigned)g->format : 0, g ? g->depth : 0));
@@ -1605,18 +1615,41 @@ static bool can_discard_mask(uint8_t op, PicturePtr src, PictFormatPtr mask,
list++;
}
+
+ if (!sna_picture_is_solid(src, &color))
+ return false;
+
+ return color >> 24 == 0xff;
} else {
- if (PICT_FORMAT_A(mask->format) >= PICT_FORMAT_A(g->format))
+skip:
+ if (mask->format == g->format)
return true;
- if (g->depth != 1)
- return false;
- }
+ if (mask->format == alphaless(g->format))
+ return true;
+
+ if (PICT_FORMAT_TYPE(g->format) == PICT_TYPE_A &&
+ PICT_FORMAT_TYPE(mask->format) != PICT_TYPE_A)
+ return true;
- if (!sna_picture_is_solid(src, &color))
return false;
+ }
+}
- return color >> 24 == 0xff;
+static uint32_t pixman_format(PictFormatPtr short_format)
+{
+ uint32_t bpp;
+
+ bpp = short_format->depth;
+ if (bpp <= 1)
+ bpp = 1;
+ else if (bpp <= 8)
+ bpp = 8;
+ else if (bpp <= 16)
+ bpp = 16;
+ else
+ bpp = 32;
+ return bpp << 24 | short_format->format;
}
static void
@@ -1756,7 +1789,7 @@ next:
if (sigtrap_get() == 0) {
if (mask_format) {
pixman_composite_glyphs(op, src_image, dst_image,
- mask_format->format | (mask_format->depth << 24),
+ pixman_format(mask_format),
src_x + src_dx + region.extents.x1 - dst_x,
src_y + src_dy + region.extents.y1 - dst_y,
region.extents.x1, region.extents.y1,
@@ -1815,10 +1848,10 @@ out:
x, y,
mask_format->depth,
(long)mask_format->format,
- (long)(mask_format->depth << 24 | mask_format->format),
+ (long)pixman_format(mask_format),
NeedsComponent(mask_format->format)));
mask_image =
- pixman_image_create_bits(mask_format->depth << 24 | mask_format->format,
+ pixman_image_create_bits(pixman_format(mask_format),
region.extents.x2 - region.extents.x1,
region.extents.y2 - region.extents.y1,
NULL, 0);
@@ -2086,12 +2119,6 @@ glyphs_via_image(struct sna *sna,
src_x += box.x1 - list->xOff;
src_y += box.y1 - list->yOff;
- if (format->depth < 8) {
- format = PictureMatchFormat(screen, 8, PICT_a8);
- if (!format)
- return false;
- }
-
DBG(("%s: small mask [format=%lx, depth=%d, size=%d], rendering glyphs to upload buffer\n",
__FUNCTION__, (unsigned long)format->format,
format->depth, (uint32_t)width*height*format->depth));
@@ -2104,7 +2131,7 @@ glyphs_via_image(struct sna *sna,
return false;
mask_image =
- pixman_image_create_bits(format->depth << 24 | format->format,
+ pixman_image_create_bits(pixmap->drawable.bitsPerPixel << 24 | format->format,
width, height,
pixmap->devPrivate.ptr,
pixmap->devKind);
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 8a9c7f4c..d95536ec 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -54,7 +54,7 @@ sna_format_for_depth(int depth)
{
switch (depth) {
case 1: return PICT_a1;
- case 4: return PICT_a4;
+ case 4: return PICT_x4a4;
case 8: return PICT_a8;
case 15: return PICT_x1r5g5b5;
case 16: return PICT_r5g6b5;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 19:54:24 +0000