From 8cb07602ffb3684e75f7001b2209f70a55b8c1a0 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 5 Aug 2025 20:16:49 +0200
Subject: [PATCH] treewide: replace PICT_x1r5g5b5 by PIXMAN_x1r5g5b5

Try not to use old compat macros anymore, use the real ones instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 exa/exa_render.c        | 2 +-
 glamor/glamor.c         | 4 ++--
 glamor/glamor_picture.c | 2 +-
 glamor/glamor_render.c  | 2 +-
 render/picture.c        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/exa/exa_render.c b/exa/exa_render.c
index 6f4531cdcc..97cd317882 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -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:
diff --git a/glamor/glamor.c b/glamor/glamor.c
index 75b4e33e40..ae40e94163 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -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);
     }
 
diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
index c51dbc763c..0855656fe2 100644
--- a/glamor/glamor_picture.c
+++ b/glamor/glamor_picture.c
@@ -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;
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 609d653a85..f5ac10a4fe 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -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;
     }
diff --git a/render/picture.c b/render/picture.c
index 72c49fee2f..0efb596c70 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -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 */