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/glx/glxext.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/glx/glxext.c')
| -rw-r--r-- | xorg-server/glx/glxext.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index b5be7780c..ac6608882 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -43,7 +43,6 @@ #include <registry.h>
#include "privates.h"
#include <os.h>
-#include "g_disptab.h"
#include "unpack.h"
#include "glxutil.h"
#include "glxext.h"
@@ -62,7 +61,6 @@ __GLXcontext *__glXContextList; */
RESTYPE __glXContextRes;
RESTYPE __glXDrawableRes;
-RESTYPE __glXSwapBarrierRes;
/*
** Reply for most singles.
@@ -232,19 +230,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;
-}
-
/************************************************************************/
/*
@@ -362,9 +347,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)))
|