From d674029f1faccbead8575ca107a4696912290448 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 4 Jun 2025 13:55:11 +0200 Subject: [PATCH] Revert "(!1987) glamor: unexport GLAMOR_CREATE_PIXMAP_* defines" This reverts commit 85267d38ac5f50c62d61d233786bcd50c63bfb7a. These are needed by the RDP module (www.xrdp.org). Signed-off-by: Enrico Weigelt, metux IT consult --- glamor/glamor.h | 8 ++++++++ glamor/glamor_priv.h | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/glamor/glamor.h b/glamor/glamor.h index e95c5fb13..09828b068 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -117,6 +117,14 @@ extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth, unsigned int usage); extern _X_EXPORT Bool glamor_destroy_pixmap(PixmapPtr pixmap); +/* needed by Xrdp module */ +#define GLAMOR_CREATE_PIXMAP_CPU 0x100 +#define GLAMOR_CREATE_PIXMAP_FIXUP 0x101 +#define GLAMOR_CREATE_FBO_NO_FBO 0x103 +#define GLAMOR_CREATE_NO_LARGE 0x105 +#define GLAMOR_CREATE_PIXMAP_NO_TEXTURE 0x106 +#define GLAMOR_CREATE_FORMAT_CBCR 0x107 + /* @glamor_egl_exchange_buffers: Exchange the underlying buffers(KHR image,fbo). * * @front: front pixmap. diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index ef10c60cf..0f76e144e 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -175,13 +175,6 @@ enum gradient_shader { SHADER_GRADIENT_COUNT, }; -#define GLAMOR_CREATE_PIXMAP_CPU 0x100 -#define GLAMOR_CREATE_PIXMAP_FIXUP 0x101 -#define GLAMOR_CREATE_FBO_NO_FBO 0x103 -#define GLAMOR_CREATE_NO_LARGE 0x105 -#define GLAMOR_CREATE_PIXMAP_NO_TEXTURE 0x106 -#define GLAMOR_CREATE_FORMAT_CBCR 0x107 - struct glamor_screen_private; struct glamor_pixmap_private;