treewide: replace PICT_x2r10g10b10 by PIXMAN_x2r10g10b10

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:20:46 +02:00
committed by Enrico Weigelt
parent aba79cbfca
commit 522a2d4280
4 changed files with 4 additions and 4 deletions

View File

@@ -599,7 +599,7 @@ glamor_setup_formats(ScreenPtr screen)
glamor_add_format(screen, 30, PIXMAN_x2b10g10r10,
GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, TRUE);
} else {
glamor_add_format(screen, 30, PICT_x2r10g10b10,
glamor_add_format(screen, 30, PIXMAN_x2r10g10b10,
GL_RGB10_A2, GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, TRUE);
}

View File

@@ -138,7 +138,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
}
break;
case PICT_x2r10g10b10:
case PIXMAN_x2r10g10b10:
case PICT_a2r10g10b10:
if (!glamor_priv->is_gles) {
*tex_format = GL_BGRA;

View File

@@ -860,7 +860,7 @@ glamor_render_format_is_supported(PicturePtr picture)
switch (picture->format) {
case PICT_a2r10g10b10:
return storage_format == PICT_x2r10g10b10;
return storage_format == PIXMAN_x2r10g10b10;
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
return storage_format == PIXMAN_a8r8g8b8 || storage_format == PIXMAN_x8r8g8b8;

View File

@@ -276,7 +276,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
}
if (pDepth->depth >= 30) {
addFormat(formats, &nformats, PICT_a2r10g10b10, pDepth->depth);
addFormat(formats, &nformats, PICT_x2r10g10b10, pDepth->depth);
addFormat(formats, &nformats, PIXMAN_x2r10g10b10, pDepth->depth);
addFormat(formats, &nformats, PICT_a2b10g10r10, pDepth->depth);
addFormat(formats, &nformats, PIXMAN_x2b10g10r10, pDepth->depth);
}