diff options
| author | Keith Packard <keithp@keithp.com> | 2010-11-30 13:30:59 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-11-30 13:30:59 -0800 |
| commit | 02449ee24b484c9fea501df5274d95a9f87cab23 (patch) | |
| tree | e8df05a624f7f5af14a300e8506ed9da678a28d8 /glx/glxext.c | |
| parent | afd6eb66d5ef6a59be4c03da4588aaa2ee47b9ad (diff) | |
| parent | b85f9063c2370d7710523bccb8bf030a0710425b (diff) | |
Merge remote branch 'ajax/for-keithp'
Diffstat (limited to 'glx/glxext.c')
| -rw-r--r-- | glx/glxext.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/glx/glxext.c b/glx/glxext.c index f5ebe4f7e..4bd5d6b6b 100644 --- a/glx/glxext.c +++ b/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))) |