diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index 22b698529f..732c3fb478 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -194,7 +194,6 @@ cat > sdksyms.c << EOF #include "mizerarc.h" #include "micoord.h" #include "mistruct.h" -#include "mioverlay.h" /* randr/Makefile.am */ diff --git a/mi/meson.build b/mi/meson.build index cde465a9be..ce8840b51c 100644 --- a/mi/meson.build +++ b/mi/meson.build @@ -33,7 +33,6 @@ hdrs_mi = [ 'migc.h', 'mi.h', 'miline.h', - 'mioverlay.h', 'mipointer.h', 'mipointrst.h', 'mistruct.h', diff --git a/mi/mioverlay.c b/mi/mioverlay.c index b55cc34365..a412bcf55c 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,8 +1,24 @@ - #include #include "windowstr.h" -#include "mioverlay.h" + +/* this all is just left here for compat with proprietary Nvidia drivers */ + +typedef void (*miOverlayTransFunc) (ScreenPtr, int, BoxPtr); +typedef Bool (*miOverlayInOverlayFunc) (WindowPtr); + +_X_EXPORT Bool miInitOverlay(ScreenPtr pScreen, + miOverlayInOverlayFunc inOverlay, + miOverlayTransFunc trans); + +_X_EXPORT Bool miOverlayGetPrivateClips(WindowPtr pWin, + RegionPtr *borderClip, + RegionPtr *clipList); + +_X_EXPORT Bool miOverlayCollectUnderlayRegions(WindowPtr, RegionPtr *); +_X_EXPORT void miOverlayComputeCompositeClip(GCPtr, WindowPtr); +_X_EXPORT Bool miOverlayCopyUnderlay(ScreenPtr); +_X_EXPORT void miOverlaySetRootClip(ScreenPtr, Bool); Bool miInitOverlay(ScreenPtr pScreen, diff --git a/mi/mioverlay.h b/mi/mioverlay.h deleted file mode 100644 index 1514e51b48..0000000000 --- a/mi/mioverlay.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef __MIOVERLAY_H -#define __MIOVERLAY_H - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -typedef void (*miOverlayTransFunc) (ScreenPtr, int, BoxPtr); -typedef Bool (*miOverlayInOverlayFunc) (WindowPtr); - -extern _X_EXPORT Bool - -miInitOverlay(ScreenPtr pScreen, - miOverlayInOverlayFunc inOverlay, miOverlayTransFunc trans); - -extern _X_EXPORT Bool - -miOverlayGetPrivateClips(WindowPtr pWin, - RegionPtr *borderClip, RegionPtr *clipList); - -extern _X_EXPORT Bool miOverlayCollectUnderlayRegions(WindowPtr, RegionPtr *); -extern _X_EXPORT void miOverlayComputeCompositeClip(GCPtr, WindowPtr); -extern _X_EXPORT Bool miOverlayCopyUnderlay(ScreenPtr); -extern _X_EXPORT void miOverlaySetRootClip(ScreenPtr, Bool); - -#endif /* __MIOVERLAY_H */