svn merge ^/branches/released .

1 files changed, 0 insertions, 31 deletions

diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index e4f0b5559..f44990810 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -179,8 +179,6 @@ static char GLXServerExtensions[] =
 			"GLX_SGI_make_current_read "

 #ifndef __APPLE__

 			"GLX_SGIS_multisample "

-                        "GLX_SGIX_hyperpipe "

-                        "GLX_SGIX_swap_barrier "

 #endif

 			"GLX_SGIX_fbconfig "

 			"GLX_SGIX_pbuffer "

@@ -188,31 +186,6 @@ static char GLXServerExtensions[] =
                         "GLX_INTEL_swap_event"

 			;

 

-/*

- * If your DDX driver wants to register support for swap barriers or hyperpipe

- * topology, it should call __glXHyperpipeInit() or __glXSwapBarrierInit()

- * with a dispatch table of functions to handle the requests.   In the XFree86

- * DDX, for example, you would call these near the bottom of the driver's

- * ScreenInit method, after DRI has been initialized.

- *

- * This should be replaced with a better method when we teach the server how

- * to load DRI drivers.

- */

-

-void __glXHyperpipeInit(int screen, __GLXHyperpipeExtensionFuncs *funcs)

-{

-    __GLXscreen *pGlxScreen = glxGetScreen(screenInfo.screens[screen]);

-

-    pGlxScreen->hyperpipeFuncs = funcs;

-}

-

-void __glXSwapBarrierInit(int screen, __GLXSwapBarrierExtensionFuncs *funcs)

-{

-    __GLXscreen *pGlxScreen = glxGetScreen(screenInfo.screens[screen]);

-

-    pGlxScreen->swapBarrierFuncs = funcs;

-}

-

 static Bool

 glxCloseScreen (int index, ScreenPtr pScreen)

 {

@@ -429,10 +402,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
 	if (i == pScreen->numVisuals)

 	    continue;

 

-	/* Make sure the FBconfig supports window drawables */

-	if (!(config->drawableType & GLX_WINDOW_BIT))

-	    continue;

-

 	/* Create a new X visual for our FBconfig. */

 	visual = AddScreenVisuals(pScreen, 1, depth);

 	if (visual == NULL)