diff options
| author | Jeremy Huddleston <jeremy@tifa.local> | 2007-11-21 19:51:14 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@tifa.local> | 2007-11-21 19:52:11 -0800 |
| commit | bcbaf2a0ce34b6c5e41d2831b8b87dbd0617a89b (patch) | |
| tree | 064153d76872e4b9674b38e1fec7163d12a61cce /mi | |
| parent | a55ec1a9f4b62139dc5e5462d79d47b330c27c79 (diff) | |
Darwin: Dead code removal, Code cleanup, Added launcher
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 6fa180b2f..11e5bae07 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -338,17 +338,10 @@ extern void XFree86DGAExtensionInit(INITARGS); #endif #ifdef GLXEXT typedef struct __GLXprovider __GLXprovider; -#ifdef INXDARWINAPP -extern __GLXprovider* __DarwinglXMesaProvider; -extern void DarwinGlxPushProvider(__GLXprovider *impl); -extern void DarwinGlxExtensionInit(INITARGS); -extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *); -#else extern __GLXprovider __glXMesaProvider; extern void GlxPushProvider(__GLXprovider *impl); extern void GlxExtensionInit(INITARGS); -#endif // INXDARWINAPP -#endif // GLXEXT +#endif #ifdef XF86DRI extern void XFree86DRIExtensionInit(INITARGS); #endif @@ -631,10 +624,6 @@ InitExtensions(argc, argv) #endif #endif #ifdef XFIXES - /* must be before Render to layer DisplayCursor correctly */ - if (!noXFixesExtension) XFixesExtensionInit(); -#endif -#ifdef RENDER if (!noRenderExtension) RenderExtensionInit(); #endif #ifdef RANDR @@ -657,25 +646,15 @@ InitExtensions(argc, argv) #endif #ifdef GLXEXT -#ifdef INXDARWINAPP - DarwinGlxPushProvider(__DarwinglXMesaProvider); - if (!noGlxExtension) DarwinGlxExtensionInit(); -#else GlxPushProvider(&__glXMesaProvider); if (!noGlxExtension) GlxExtensionInit(); #endif -#endif } void InitVisualWrap() { miResetInitVisuals(); -#ifdef GLXEXT -#ifdef INXDARWINAPP - DarwinGlxWrapInitVisuals(&miInitVisualsProc); -#endif -#endif } #else /* XFree86LOADER */ |