From 6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 21:25:49 +0100 Subject: Lift mi to xorg-xserver-7.1/1.1.0 state I left out glx changes to miinitext.c for now. --- nx-X11/programs/Xserver/mi/miinitext.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'nx-X11/programs/Xserver/mi/miinitext.c') diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index f40ea8a8e..5f9d96302 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -80,9 +80,6 @@ extern Bool noDamageExtension; #ifdef DBE extern Bool noDbeExtension; #endif -#ifdef DPSEXT -extern Bool noDPSExtension; -#endif #ifdef DPMSExtension extern Bool noDPMSExtension; #endif @@ -142,7 +139,6 @@ extern Bool noXIdleExtension; extern Bool noXvExtension; #endif -#define INITARGS void typedef void (*InitExtension)(void); #ifdef MITSHM @@ -228,6 +224,11 @@ extern void SecurityExtensionInit(void); extern void XFree86BigfontExtensionInit(void); #endif #ifdef GLXEXT +/* +typedef struct __GLXprovider __GLXprovider; +extern __GLXprovider __glXMesaProvider; +extern void GlxPushProvider(__GLXprovider *impl); +*/ #ifndef __DARWIN__ extern void GlxExtensionInit(void); extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); @@ -290,9 +291,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef DBE { "DOUBLE-BUFFER", &noDbeExtension }, #endif -#ifdef DPSEXT - { "DPSExtension", &noDPSExtension }, -#endif #ifdef DPMSExtension { "DPMS", &noDPMSExtension }, #endif @@ -447,6 +445,9 @@ InitExtensions(argc, argv) #endif #endif #ifdef GLXEXT + /* + GlxPushProvider(&__glXMesaProvider); + */ #ifndef __DARWIN__ if (!noGlxExtension) GlxExtensionInit(); #else -- cgit v1.2.3