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

treewide: replace PICT_x1r5g5b5 by PIXMAN_x1r5g5b5

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:16:49 +02:00
committed by Enrico Weigelt
parent 4ce30fdb6b
commit 8cb07602ff
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
exa/exa_render.c
View File

@@ -60,7 +60,7 @@ exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n)
case PIXMAN_r5g6b5:
snprintf(format, 20, "RGB565 ");
break;
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
snprintf(format, 20, "RGB555 ");
break;
case PIXMAN_a8:

4
glamor/glamor.c
View File

@@ -572,10 +572,10 @@ glamor_setup_formats(ScreenPtr screen)
* Instead, just store 16 bits using the trusted 565 path, and
* disable render accel for now.
*/
glamor_add_format(screen, 15, PICT_x1r5g5b5,
glamor_add_format(screen, 15, PIXMAN_x1r5g5b5,
GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, TRUE);
} else {
glamor_add_format(screen, 15, PICT_x1r5g5b5,
glamor_add_format(screen, 15, PIXMAN_x1r5g5b5,
GL_RGBA, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, TRUE);
}

2
glamor/glamor_picture.c
View File

@@ -183,7 +183,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen,
}
break;
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
case PICT_a1r5g5b5:
if (!glamor_priv->is_gles) {
*tex_format = GL_BGRA;

2
glamor/glamor_render.c
View File

@@ -865,7 +865,7 @@ glamor_render_format_is_supported(PicturePtr picture)
case PIXMAN_x8r8g8b8:
return storage_format == PIXMAN_a8r8g8b8 || storage_format == PIXMAN_x8r8g8b8;
case PICT_a1r5g5b5:
return storage_format == PICT_x1r5g5b5;
return storage_format == PIXMAN_x1r5g5b5;
default:
return picture->format == storage_format;
}

2
render/picture.c
View File

@@ -256,7 +256,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
}
/* depth 15 formats */
if (pDepth->depth >= 15) {
addFormat(formats, &nformats, PICT_x1r5g5b5, pDepth->depth);
addFormat(formats, &nformats, PIXMAN_x1r5g5b5, pDepth->depth);
addFormat(formats, &nformats, PICT_x1b5g5r5, pDepth->depth);
}
/* depth 16 formats */