From 30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 1 Dec 2010 06:54:34 +0000
Subject: xserver libX11 libxcb update 1/12/2010

---
 xorg-server/glx/glxext.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'xorg-server/glx/glxext.c')

diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index 44e96bd8b..7d816b481 100644
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -39,7 +39,6 @@
 #include <registry.h>
 #include "privates.h"
 #include <os.h>
-#include "g_disptab.h"
 #include "unpack.h"
 #include "glxutil.h"
 #include "glxext.h"
@@ -58,7 +57,6 @@ __GLXcontext *__glXContextList;
 */
 RESTYPE __glXContextRes;
 RESTYPE __glXDrawableRes;
-RESTYPE __glXSwapBarrierRes;
 
 /*
 ** Reply for most singles.
@@ -228,19 +226,6 @@ GLboolean __glXFreeContext(__GLXcontext *cx)
     return GL_TRUE;
 }
 
-extern RESTYPE __glXSwapBarrierRes;
-
-static int SwapBarrierGone(int screen, XID drawable)
-{
-    __GLXscreen *pGlxScreen = glxGetScreen(screenInfo.screens[screen]);
-
-    if (pGlxScreen->swapBarrierFuncs) {
-        pGlxScreen->swapBarrierFuncs->bindSwapBarrierFunc(screen, drawable, 0);
-    }
-    FreeResourceByType(drawable, __glXSwapBarrierRes, FALSE);
-    return True;
-}
-
 /************************************************************************/
 
 /*
@@ -358,9 +343,7 @@ void GlxExtensionInit(void)
 					    "GLXContext");
     __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone,
 					     "GLXDrawable");
-    __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone,
-						"GLXSwapBarrier");
-    if (!__glXContextRes || !__glXDrawableRes || !__glXSwapBarrierRes)
+    if (!__glXContextRes || !__glXDrawableRes)
 	return;
 
     if (!dixRegisterPrivateKey(&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof (__GLXclientState)))
-- 
cgit v1.2.3