XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: replace PICT_a1 by PIXMAN_a1

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:13:47 +02:00
committed by Enrico Weigelt
parent b736739892
commit c113bc77ae
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
exa/exa_render.c
View File

@@ -66,7 +66,7 @@ exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n)
case PICT_a8:
snprintf(format, 20, "A8 ");
break;
case PICT_a1:
case PIXMAN_a1:
snprintf(format, 20, "A1 ");
break;
default:
@@ -1067,7 +1067,7 @@ exaCreateAlphaPicture(ScreenPtr pScreen,
if (!pPictFormat) {
if (pDst->polyEdge == PolyEdgeSharp)
pPictFormat = PictureMatchFormat(pScreen, 1, PICT_a1);
pPictFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1);
else
pPictFormat = PictureMatchFormat(pScreen, 8, PICT_a8);
if (!pPictFormat)
@@ -1153,7 +1153,7 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
}
else {
if (pDst->polyEdge == PolyEdgeSharp)
maskFormat = PictureMatchFormat(pScreen, 1, PICT_a1);
maskFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1);
else
maskFormat = PictureMatchFormat(pScreen, 8, PICT_a8);
for (; ntrap; ntrap--, traps++)
@@ -1215,7 +1215,7 @@ exaTriangles(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
}
else {
if (pDst->polyEdge == PolyEdgeSharp)
maskFormat = PictureMatchFormat(pScreen, 1, PICT_a1);
maskFormat = PictureMatchFormat(pScreen, 1, PIXMAN_a1);
else
maskFormat = PictureMatchFormat(pScreen, 8, PICT_a8);

4
glamor/glamor.c
View File

@@ -551,12 +551,12 @@ glamor_setup_formats(ScreenPtr screen)
* on GLES2 due to lack of texture swizzle.
*/
if (glamor_priv->has_rg && glamor_priv->has_texture_swizzle) {
glamor_add_format(screen, 1, PICT_a1,
glamor_add_format(screen, 1, PIXMAN_a1,
GL_R8, GL_RED, GL_UNSIGNED_BYTE, FALSE);
glamor_add_format(screen, 8, PICT_a8,
GL_R8, GL_RED, GL_UNSIGNED_BYTE, TRUE);
} else {
glamor_add_format(screen, 1, PICT_a1,
glamor_add_format(screen, 1, PIXMAN_a1,
GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, FALSE);
glamor_add_format(screen, 8, PICT_a8,
GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, TRUE);

4
glamor/glamor_picture.c
View File

@@ -60,7 +60,7 @@ static void byte_swap_swizzle(GLenum *swizzle)
* Returns the GL format and type for uploading our bits to a given PictFormat.
*
* We may need to tell the caller to translate the bits to another
* format, as in PICT_a1 (which GL doesn't support). We may also need
* format, as in PIXMAN_a1 (which GL doesn't support). We may also need
* to tell the GL to swizzle the texture on sampling, because GLES3
* doesn't support the GL_UNSIGNED_INT_8_8_8_8{,_REV} types, so we
* don't have enough channel reordering options at upload time without
@@ -84,7 +84,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
swizzle[3] = GL_ALPHA;
switch (format) {
case PICT_a1:
case PIXMAN_a1:
*tex_format = glamor_priv->formats[1].format;
*tex_type = GL_UNSIGNED_BYTE;
*temp_format = PICT_a8;

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 */
static inline Bool glamor_picture_is_alpha(PicturePtr picture)
{
return picture->format == PICT_a1 || picture->format == PICT_a8;
return picture->format == PIXMAN_a1 || picture->format == PICT_a8;
}
/* Return whether 'picture' is storing alpha bits in the red channel */

4
glamor/glamor_trapezoid.c
View File

@@ -51,7 +51,7 @@ glamor_create_mask_picture(ScreenPtr screen,
if (!pict_format) {
if (dst->polyEdge == PolyEdgeSharp)
pict_format = PictureMatchFormat(screen, 1, PICT_a1);
pict_format = PictureMatchFormat(screen, 1, PIXMAN_a1);
else
pict_format = PictureMatchFormat(screen, 8, PICT_a8);
if (!pict_format)
@@ -94,7 +94,7 @@ glamor_trapezoids(CARD8 op,
*/
if (!mask_format) {
if (dst->polyEdge == PolyEdgeSharp)
mask_format = PictureMatchFormat(screen, 1, PICT_a1);
mask_format = PictureMatchFormat(screen, 1, PIXMAN_a1);
else
mask_format = PictureMatchFormat(screen, 8, PICT_a8);
for (; ntrap; ntrap--, traps++)

2
render/picture.c
View File

@@ -171,7 +171,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
nformats = 0;
/* formats required by protocol */
formats[nformats].format = PICT_a1;
formats[nformats].format = PIXMAN_a1;
formats[nformats].depth = 1;
nformats++;
formats[nformats].format = PICT_FORMAT(BitsPerPixel(8),