From 9d88cc5f119ea69a9a9e5a8544c5fd8e966e4a7e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 26 Feb 2025 17:56:15 +0100 Subject: [PATCH] Revert "mi: drop obsolete miOverlayCopyUnderlay()" This reverts commit be6985948d6d79c60a08a11f578346f62ab7a448. Requested by Nvidia - their proprietary driver still needs it. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- mi/mioverlay.c | 11 +++++++++++ mi/mioverlay.h | 1 + 2 files changed, 12 insertions(+) diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 0c1d79d70..6dd99d89a 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -58,9 +58,14 @@ typedef struct { static DevPrivateKeyRec miOverlayWindowKeyRec; #define miOverlayWindowKey (&miOverlayWindowKeyRec) +static DevPrivateKeyRec miOverlayScreenKeyRec; + +#define miOverlayScreenKey (&miOverlayScreenKeyRec) static void MarkUnderlayWindow(WindowPtr); +#define MIOVERLAY_GET_SCREEN_PRIVATE(pScreen) ((miOverlayScreenPtr) \ + dixLookupPrivate(&(pScreen)->devPrivates, miOverlayScreenKey)) #define MIOVERLAY_GET_WINDOW_PRIVATE(pWin) ((miOverlayWindowPtr) \ dixLookupPrivate(&(pWin)->devPrivates, miOverlayWindowKey)) #define MIOVERLAY_GET_WINDOW_TREE(pWin) \ @@ -97,6 +102,12 @@ miOverlaySetRootClip(ScreenPtr pScreen, Bool enable) /****************************************************************/ +Bool +miOverlayCopyUnderlay(ScreenPtr pScreen) +{ + return MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->copyUnderlay; +} + static void MarkUnderlayWindow(WindowPtr pWin) { diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 68a88260a..ca4c06db5 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -9,6 +9,7 @@ typedef void (*miOverlayTransFunc) (ScreenPtr, int, BoxPtr); typedef Bool (*miOverlayInOverlayFunc) (WindowPtr); +extern _X_EXPORT Bool miOverlayCopyUnderlay(ScreenPtr); extern _X_EXPORT void miOverlaySetRootClip(ScreenPtr, Bool); #endif /* __MIOVERLAY_H */