diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
| commit | 6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (patch) | |
| tree | fd434665398565d3bb9c68b97c978b63a7756add /xorg-server/Xext/panoramiX.c | |
| parent | d8f61fbb152bca029b56b117c679b03b6a72b467 (diff) | |
| parent | 30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 (diff) | |
| download | vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.gz vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.bz2 vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/Xext/panoramiX.c')
| -rw-r--r-- | xorg-server/Xext/panoramiX.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c index 1b340e80e..489224221 100644 --- a/xorg-server/Xext/panoramiX.c +++ b/xorg-server/Xext/panoramiX.c @@ -53,6 +53,12 @@ Equipment Corporation. #include "servermd.h"
#include "resource.h"
#include "picturestr.h"
+#ifdef XFIXES
+#include "xfixesint.h"
+#endif
+#ifdef COMPOSITE
+#include "compint.h"
+#endif
#include "modinit.h"
#include "protocol-versions.h"
@@ -581,6 +587,13 @@ void PanoramiXExtensionInit(int argc, char *argv[]) ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor;
PanoramiXRenderInit ();
+#ifdef XFIXES
+ PanoramiXFixesInit ();
+#endif
+#ifdef COMPOSITE
+ PanoramiXCompositeInit ();
+#endif
+
}
extern Bool CreateConnectionBlock(void);
@@ -882,6 +895,9 @@ static void PanoramiXResetProc(ExtensionEntry* extEntry) int i;
PanoramiXRenderReset ();
+#ifdef XFIXES
+ PanoramiXFixesReset ();
+#endif
screenInfo.numScreens = PanoramiXNumScreens;
for (i = 256; i--; )
ProcVector[i] = SavedProcVector[i];
|