ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: replace PICT_a8 by PIXMAN_a8

Browse Source 
Try not to use old compat macros anymore, use the real ones instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-08-05 20:15:40 +02:00 committed by Enrico Weigelt
parent c113bc77ae
commit 4ce30fdb6b
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
exa/exa_glyphs.c
View File

@ -85,11 +85,11 @@ exaGlyphsInit(ScreenPtr pScreen)
memset(pExaScr->glyphCaches, 0, sizeof(pExaScr->glyphCaches)); memset(pExaScr->glyphCaches, 0, sizeof(pExaScr->glyphCaches));
pExaScr->glyphCaches[i].format = PICT_a8; pExaScr->glyphCaches[i].format = PIXMAN_a8;
pExaScr->glyphCaches[i].glyphWidth = pExaScr->glyphCaches[i].glyphHeight = pExaScr->glyphCaches[i].glyphWidth = pExaScr->glyphCaches[i].glyphHeight =
16; 16;
i++; i++;
pExaScr->glyphCaches[i].format = PICT_a8; pExaScr->glyphCaches[i].format = PIXMAN_a8;
pExaScr->glyphCaches[i].glyphWidth = pExaScr->glyphCaches[i].glyphHeight = pExaScr->glyphCaches[i].glyphWidth = pExaScr->glyphCaches[i].glyphHeight =
32; 32;
i++; i++;
@ -445,7 +445,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen,
DBG_GLYPH_CACHE(("(%d,%d,%s): buffering glyph %lx\n", DBG_GLYPH_CACHE(("(%d,%d,%s): buffering glyph %lx\n",
cache->glyphWidth, cache->glyphHeight, cache->glyphWidth, cache->glyphHeight,
cache->format == PICT_a8 ? "A" : "ARGB", cache->format == PIXMAN_a8 ? "A" : "ARGB",
(long) *(CARD32 *) pGlyph->sha1)); (long) *(CARD32 *) pGlyph->sha1));
pos = exaGlyphCacheHashLookup(cache, pGlyph); pos = exaGlyphCacheHashLookup(cache, pGlyph);
@ -553,7 +553,7 @@ exaBufferGlyph(ScreenPtr pScreen,
return ExaGlyphNeedFlush; return ExaGlyphNeedFlush;
if (PIXMAN_FORMAT_BPP(format) == 1) if (PIXMAN_FORMAT_BPP(format) == 1)
format = PICT_a8; format = PIXMAN_a8;
for (i = 0; i < EXA_NUM_GLYPH_CACHES; i++) { for (i = 0; i < EXA_NUM_GLYPH_CACHES; i++) {
ExaGlyphCachePtr cache = &pExaScr->glyphCaches[i]; ExaGlyphCachePtr cache = &pExaScr->glyphCaches[i];
@ -707,7 +707,7 @@ exaGlyphs(CARD8 op,
height = extents.y2 - extents.y1; height = extents.y2 - extents.y1;
if (maskFormat->depth == 1) { if (maskFormat->depth == 1) {
PictFormatPtr a8Format = PictureMatchFormat(pScreen, 8, PICT_a8); PictFormatPtr a8Format = PictureMatchFormat(pScreen, 8, PIXMAN_a8);
if (a8Format) if (a8Format)
maskFormat = a8Format; maskFormat = a8Format;

8
exa/exa_render.c
View File

@ -63,7 +63,7 @@ exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n)
case PICT_x1r5g5b5: case PICT_x1r5g5b5:
snprintf(format, 20, "RGB555 "); snprintf(format, 20, "RGB555 ");
break; break;
case PICT_a8: case PIXMAN_a8:
snprintf(format, 20, "A8 "); snprintf(format, 20, "A8 ");
break; break;
case PIXMAN_a1: case PIXMAN_a1:
@ -1069,7 +1069,7 @@ exaCreateAlphaPicture(ScreenPtr pScreen,
if (pDst->polyEdge == PolyEdgeSharp) if (pDst->polyEdge == PolyEdgeSharp)
pPictFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1); pPictFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1);
else else
pPictFormat = PictureMatchFormat(pScreen, 8, PICT_a8); pPictFormat = PictureMatchFormat(pScreen, 8, PIXMAN_a8);
if (!pPictFormat) if (!pPictFormat)
return 0; return 0;
} }
@ -1155,7 +1155,7 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (pDst->polyEdge == PolyEdgeSharp) if (pDst->polyEdge == PolyEdgeSharp)
maskFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1); maskFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1);
else else
maskFormat = PictureMatchFormat(pScreen, 8, PICT_a8); maskFormat = PictureMatchFormat(pScreen, 8, PIXMAN_a8);
for (; ntrap; ntrap--, traps++) for (; ntrap; ntrap--, traps++)
exaTrapezoids(op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); exaTrapezoids(op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
} }
@ -1217,7 +1217,7 @@ exaTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
if (pDst->polyEdge == PolyEdgeSharp) if (pDst->polyEdge == PolyEdgeSharp)
maskFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1); maskFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1);
else else
maskFormat = PictureMatchFormat(pScreen, 8, PICT_a8); maskFormat = PictureMatchFormat(pScreen, 8, PIXMAN_a8);
for (; ntri; ntri--, tris++) for (; ntri; ntri--, tris++)
exaTriangles(op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris); exaTriangles(op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris);

4
glamor/glamor.c
View File

@ -553,12 +553,12 @@ glamor_setup_formats(ScreenPtr screen)
if (glamor_priv->has_rg && glamor_priv->has_texture_swizzle) { if (glamor_priv->has_rg && glamor_priv->has_texture_swizzle) {
glamor_add_format(screen, 1, PIXMAN_a1, glamor_add_format(screen, 1, PIXMAN_a1,
GL_R8, GL_RED, GL_UNSIGNED_BYTE, FALSE); GL_R8, GL_RED, GL_UNSIGNED_BYTE, FALSE);
glamor_add_format(screen, 8, PICT_a8, glamor_add_format(screen, 8, PIXMAN_a8,
GL_R8, GL_RED, GL_UNSIGNED_BYTE, TRUE); GL_R8, GL_RED, GL_UNSIGNED_BYTE, TRUE);
} else { } else {
glamor_add_format(screen, 1, PIXMAN_a1, glamor_add_format(screen, 1, PIXMAN_a1,
GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, FALSE); GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, FALSE);
glamor_add_format(screen, 8, PICT_a8, glamor_add_format(screen, 8, PIXMAN_a8,
GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, TRUE); GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, TRUE);
} }

2
glamor/glamor_composite_glyphs.c
View File

@ -583,7 +583,7 @@ glamor_composite_glyphs_init(ScreenPtr screen)
/* Don't stick huge glyphs in the atlases */ /* Don't stick huge glyphs in the atlases */
glamor_priv->glyph_max_dim = glamor_priv->glyph_atlas_dim / 8; glamor_priv->glyph_max_dim = glamor_priv->glyph_atlas_dim / 8;
glamor_priv->glyph_atlas_a = glamor_alloc_glyph_atlas(screen, 8, PICT_a8); glamor_priv->glyph_atlas_a = glamor_alloc_glyph_atlas(screen, 8, PIXMAN_a8);
if (!glamor_priv->glyph_atlas_a) if (!glamor_priv->glyph_atlas_a)
return FALSE; return FALSE;
glamor_priv->glyph_atlas_argb = glamor_alloc_glyph_atlas(screen, 32, PIXMAN_a8r8g8b8); glamor_priv->glyph_atlas_argb = glamor_alloc_glyph_atlas(screen, 32, PIXMAN_a8r8g8b8);

4
glamor/glamor_picture.c
View File

@ -87,7 +87,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
case PIXMAN_a1: case PIXMAN_a1:
*tex_format = glamor_priv->formats[1].format; *tex_format = glamor_priv->formats[1].format;
*tex_type = GL_UNSIGNED_BYTE; *tex_type = GL_UNSIGNED_BYTE;
*temp_format = PICT_a8; *temp_format = PIXMAN_a8;
break; break;
case PIXMAN_b8g8r8x8: case PIXMAN_b8g8r8x8:
@ -193,7 +193,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
} }
break; break;
case PICT_a8: case PIXMAN_a8:
*tex_format = glamor_priv->formats[8].format; *tex_format = glamor_priv->formats[8].format;
*tex_type = GL_UNSIGNED_BYTE; *tex_type = GL_UNSIGNED_BYTE;
break; break;

2
glamor/glamor_priv.h
View File

@ -634,7 +634,7 @@ const struct glamor_format *glamor_format_for_pixmap(PixmapPtr pixmap);
/* Return whether 'picture' is alpha-only */ /* Return whether 'picture' is alpha-only */
static inline Bool glamor_picture_is_alpha(PicturePtr picture) static inline Bool glamor_picture_is_alpha(PicturePtr picture)
{ {
return picture->format == PIXMAN_a1 || picture->format == PICT_a8; return picture->format == PIXMAN_a1 || picture->format == PIXMAN_a8;
} }
/* Return whether 'picture' is storing alpha bits in the red channel */ /* Return whether 'picture' is storing alpha bits in the red channel */

4
glamor/glamor_trapezoid.c
View File

@ -53,7 +53,7 @@ glamor_create_mask_picture(ScreenPtr screen,
if (dst->polyEdge == PolyEdgeSharp) if (dst->polyEdge == PolyEdgeSharp)
pict_format = PictureMatchFormat(screen, 1, PIXMAN_a1); pict_format = PictureMatchFormat(screen, 1, PIXMAN_a1);
else else
pict_format = PictureMatchFormat(screen, 8, PICT_a8); pict_format = PictureMatchFormat(screen, 8, PIXMAN_a8);
if (!pict_format) if (!pict_format)
return 0; return 0;
} }
@ -96,7 +96,7 @@ glamor_trapezoids(CARD8 op,
if (dst->polyEdge == PolyEdgeSharp) if (dst->polyEdge == PolyEdgeSharp)
mask_format = PictureMatchFormat(screen, 1, PIXMAN_a1); mask_format = PictureMatchFormat(screen, 1, PIXMAN_a1);
else else
mask_format = PictureMatchFormat(screen, 8, PICT_a8); mask_format = PictureMatchFormat(screen, 8, PIXMAN_a8);
for (; ntrap; ntrap--, traps++) for (; ntrap; ntrap--, traps++)
glamor_trapezoids(op, src, dst, mask_format, x_src, glamor_trapezoids(op, src, dst, mask_format, x_src,
y_src, 1, traps); y_src, 1, traps);