From 39cf14d0e97f61753b51734a9b157dc8d53b1fec Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 21 Nov 2025 16:38:40 +0100 Subject: [PATCH] render: drop PictureScreenPrivateKey and PictureWindowPrivateKey defines Not used by any external drivers, so we can drop them and directly use the corresponding fields. Signed-off-by: Enrico Weigelt, metux IT consult --- render/picture.c | 2 +- render/picturestr.h | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/render/picture.c b/render/picture.c index 520e27232d..36c282b3f1 100644 --- a/render/picture.c +++ b/render/picture.c @@ -1395,7 +1395,7 @@ FreePicture(void *value, XID pid) PicturePtr *pPrev; for (pPrev = (PicturePtr *) dixLookupPrivateAddr - (&pWindow->devPrivates, PictureWindowPrivateKey); + (&pWindow->devPrivates, &PictureWindowPrivateKeyRec); *pPrev; pPrev = &(*pPrev)->pNext) { if (*pPrev == pPicture) { *pPrev = pPicture->pNext; diff --git a/render/picturestr.h b/render/picturestr.h index c1f592a396..7ab19a7f6e 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -342,16 +342,13 @@ typedef struct _PictureScreen { } PictureScreenRec, *PictureScreenPtr; extern _X_EXPORT DevPrivateKeyRec PictureScreenPrivateKeyRec; -#define PictureScreenPrivateKey (&PictureScreenPrivateKeyRec) - extern _X_EXPORT DevPrivateKeyRec PictureWindowPrivateKeyRec; -#define PictureWindowPrivateKey (&PictureWindowPrivateKeyRec) -#define GetPictureScreen(s) ((PictureScreenPtr)dixLookupPrivate(&(s)->devPrivates, PictureScreenPrivateKey)) -#define GetPictureScreenIfSet(s) (dixPrivateKeyRegistered(PictureScreenPrivateKey) ? GetPictureScreen(s) : NULL) -#define SetPictureScreen(s,p) dixSetPrivate(&(s)->devPrivates, PictureScreenPrivateKey, p) -#define GetPictureWindow(w) ((PicturePtr)dixLookupPrivate(&(w)->devPrivates, PictureWindowPrivateKey)) -#define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p) +#define GetPictureScreen(s) ((PictureScreenPtr)dixLookupPrivate(&(s)->devPrivates, &PictureScreenPrivateKeyRec)) +#define GetPictureScreenIfSet(s) (dixPrivateKeyRegistered(&PictureScreenPrivateKeyRec) ? GetPictureScreen(s) : NULL) +#define SetPictureScreen(s,p) dixSetPrivate(&(s)->devPrivates, &PictureScreenPrivateKeyRec, p) +#define GetPictureWindow(w) ((PicturePtr)dixLookupPrivate(&(w)->devPrivates, &PictureWindowPrivateKeyRec)) +#define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, &PictureWindowPrivateKeyRec, p) extern _X_EXPORT PictFormatPtr PictureWindowFormat(WindowPtr pWindow);