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_a8r8g8b8 by PIXMAN_a8r8g8b8

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 19:41:23 +02:00 committed by Enrico Weigelt
parent 6b17a3bfbb
commit 35a43252ca
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composite/compinit.c
View File

@ -223,7 +223,7 @@ static CompAlternateVisual altVisuals[] = {
#if COMP_INCLUDE_RGB24_VISUAL
{24, PICT_r8g8b8},
#endif
{32, PICT_a8r8g8b8},
{32, PIXMAN_a8r8g8b8},
};
static Bool

6
exa/exa_glyphs.c
View File

@ -93,11 +93,11 @@ exaGlyphsInit(ScreenPtr pScreen)
pExaScr->glyphCaches[i].glyphWidth = pExaScr->glyphCaches[i].glyphHeight =
32;
i++;
pExaScr->glyphCaches[i].format = PICT_a8r8g8b8;
pExaScr->glyphCaches[i].format = PIXMAN_a8r8g8b8;
pExaScr->glyphCaches[i].glyphWidth = pExaScr->glyphCaches[i].glyphHeight =
16;
i++;
pExaScr->glyphCaches[i].format = PICT_a8r8g8b8;
pExaScr->glyphCaches[i].format = PIXMAN_a8r8g8b8;
pExaScr->glyphCaches[i].glyphWidth = pExaScr->glyphCaches[i].glyphHeight =
32;
i++;
@ -737,7 +737,7 @@ exaGlyphs(CARD8 op,
* without component-alpha) */
FreePicture((void *) pMask, (XID) 0);
argbFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8);
argbFormat = PictureMatchFormat(pScreen, 32, PIXMAN_a8r8g8b8);
if (argbFormat)
maskFormat = argbFormat;

4
exa/exa_render.c
View File

@ -45,7 +45,7 @@ exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n)
}
switch (pict->format) {
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
snprintf(format, 20, "ARGB8888");
break;
case PICT_x8r8g8b8:
@ -193,7 +193,7 @@ exaGetRGBAFromPixel(CARD32 pixel,
bshift = pFormat->direct.blue;
ashift = pFormat->direct.alpha;
}
else if (format == PICT_a8r8g8b8) {
else if (format == PIXMAN_a8r8g8b8) {
rshift = 16;
gshift = 8;
bshift = 0;

4
glamor/glamor.c
View File

@ -586,12 +586,12 @@ glamor_setup_formats(ScreenPtr screen)
assert(X_BYTE_ORDER == X_LITTLE_ENDIAN);
glamor_add_format(screen, 24, PICT_x8r8g8b8,
GL_BGRA, GL_BGRA, GL_UNSIGNED_BYTE, TRUE);
glamor_add_format(screen, 32, PICT_a8r8g8b8,
glamor_add_format(screen, 32, PIXMAN_a8r8g8b8,
GL_BGRA, GL_BGRA, GL_UNSIGNED_BYTE, TRUE);
} else {
glamor_add_format(screen, 24, PICT_x8r8g8b8,
GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE);
glamor_add_format(screen, 32, PICT_a8r8g8b8,
glamor_add_format(screen, 32, PIXMAN_a8r8g8b8,
GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE);
}

2
glamor/glamor_composite_glyphs.c
View File

@ -586,7 +586,7 @@ glamor_composite_glyphs_init(ScreenPtr screen)
glamor_priv->glyph_atlas_a = glamor_alloc_glyph_atlas(screen, 8, PICT_a8);
if (!glamor_priv->glyph_atlas_a)
return FALSE;
glamor_priv->glyph_atlas_argb = glamor_alloc_glyph_atlas(screen, 32, PICT_a8r8g8b8);
glamor_priv->glyph_atlas_argb = glamor_alloc_glyph_atlas(screen, 32, PIXMAN_a8r8g8b8);
if (!glamor_priv->glyph_atlas_argb) {
free (glamor_priv->glyph_atlas_a);
return FALSE;

2
glamor/glamor_picture.c
View File

@ -110,7 +110,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
break;
case PICT_x8r8g8b8:
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
if (!glamor_priv->is_gles) {
*tex_format = GL_BGRA;
*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;

6
glamor/glamor_render.c
View File

@ -861,9 +861,9 @@ glamor_render_format_is_supported(PicturePtr picture)
switch (picture->format) {
case PICT_a2r10g10b10:
return storage_format == PICT_x2r10g10b10;
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
return storage_format == PICT_a8r8g8b8 || storage_format == PICT_x8r8g8b8;
return storage_format == PIXMAN_a8r8g8b8 || storage_format == PICT_x8r8g8b8;
case PICT_a1r5g5b5:
return storage_format == PICT_x1r5g5b5;
default:
@ -1446,7 +1446,7 @@ glamor_convert_gradient_picture(ScreenPtr screen,
pFormat = source->pFormat;
format = pFormat->format;
} else {
format = PICT_a8r8g8b8;
format = PIXMAN_a8r8g8b8;
pFormat = PictureMatchFormat(screen, 32, format);
}

2
hw/kdrive/ephyr/ephyrcursor.c
View File

@ -136,7 +136,7 @@ ephyrRealizeARGBCursor(EphyrScrPriv *scr, CursorPtr cursor)
xcb_image_t *image;
int w = cursor->bits->width, h = cursor->bits->height;
/* dix' storage is PICT_a8r8g8b8 */
/* dix' storage is PIXMAN_a8r8g8b8 */
source = xcb_generate_id(conn);
xcb_create_pixmap(conn, 32, source, scr->win, w, h);

2
mi/midispcur.c
View File

@ -188,7 +188,7 @@ miDCRealize(ScreenPtr pScreen, CursorPtr pCursor)
int error;
PicturePtr pPicture;
pFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8);
pFormat = PictureMatchFormat(pScreen, 32, PIXMAN_a8r8g8b8);
if (!pFormat)
return FALSE;

4
render/picture.c
View File

@ -178,7 +178,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
PIXMAN_TYPE_A, 8, 0, 0, 0);
formats[nformats].depth = 8;
nformats++;
formats[nformats].format = PICT_a8r8g8b8;
formats[nformats].format = PIXMAN_a8r8g8b8;
formats[nformats].depth = 32;
nformats++;
formats[nformats].format = PICT_x8r8g8b8;
@ -838,7 +838,7 @@ createSourcePicture(void)
pPicture->pDrawable = 0;
pPicture->pFormat = 0;
pPicture->pNext = 0;
pPicture->format = PICT_a8r8g8b8;
pPicture->format = PIXMAN_a8r8g8b8;
SetPictureToDefaults(pPicture);
return pPicture;

4
render/render.c
View File

@ -1508,7 +1508,7 @@ ProcRenderCreateCursor(ClientPtr client)
pScreen->SourceValidate(pSrc->pDrawable, 0, 0, width, height,
IncludeInferiors);
if (pSrc->format == PICT_a8r8g8b8) {
if (pSrc->format == PIXMAN_a8r8g8b8) {
(*pScreen->GetImage) (pSrc->pDrawable,
0, 0, width, height, ZPixmap,
0xffffffff, (void *) argbbits);
@ -1519,7 +1519,7 @@ ProcRenderCreateCursor(ClientPtr client)
PictFormatPtr pFormat;
int error;
pFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8);
pFormat = PictureMatchFormat(pScreen, 32, PIXMAN_a8r8g8b8);
if (!pFormat) {
free(argbbits);
free(srcbits);