XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +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
Download Patch File Download Diff File Expand all files Collapse all files

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);
}