[PATCH xserver] glx: Remove enter/leave server API

[Adam Jackson]

Dead code since:

    commit 8aacf47e1778d8b72811b025a82452b933d3c1f2
    Author: Adam Jackson <ajax at redhat.com>
    Date:   Fri Oct 4 12:58:19 2013 -0400

        glx: Remove DRI1 AIGLX (v2)

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 glx/glxcmds.c   |  2 --
 glx/glxext.c    | 50 --------------------------------------------------
 glx/glxserver.h |  5 -----
 3 files changed, 57 deletions(-)

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index af36cf1..508815b 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -1441,11 +1441,9 @@ DoCreatePbuffer(ClientPtr client, int screenNum, XID fbconfigId,
     if (!validGlxFBConfig(client, pGlxScreen, fbconfigId, &config, &err))
         return err;
 
-    __glXenterServer(GL_FALSE);
     pPixmap = (*pGlxScreen->pScreen->CreatePixmap) (pGlxScreen->pScreen,
                                                     width, height,
                                                     config->rgbBits, 0);
-    __glXleaveServer(GL_FALSE);
     if (!pPixmap)
         return BadAlloc;
 
diff --git a/glx/glxext.c b/glx/glxext.c
index d595a05..b9b82eb 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -107,7 +107,6 @@ ContextGone(__GLXcontext * cx, XID id)
 
 static __GLXcontext *glxPendingDestroyContexts;
 static __GLXcontext *glxAllContexts;
-static int glxServerLeaveCount;
 static int glxBlockClients;
 
 /*
@@ -208,9 +207,7 @@ __glXFreeContext(__GLXcontext * cx)
      * the latter case we need to lift the DRI lock manually. */
 
     if (!glxBlockClients) {
-        __glXleaveServer(GL_FALSE);
         cx->destroy(cx);
-        __glXenterServer(GL_FALSE);
     }
     else {
         cx->next = glxPendingDestroyContexts;
@@ -531,53 +528,12 @@ glxResumeClients(void)
             AttendClient(clients[i]);
     }
 
-    __glXleaveServer(GL_FALSE);
     for (cx = glxPendingDestroyContexts; cx != NULL; cx = next) {
         next = cx->next;
 
         cx->destroy(cx);
     }
     glxPendingDestroyContexts = NULL;
-    __glXenterServer(GL_FALSE);
-}
-
-static void
-__glXnopEnterServer(GLboolean rendering)
-{
-}
-
-static void
-__glXnopLeaveServer(GLboolean rendering)
-{
-}
-
-static void (*__glXenterServerFunc) (GLboolean) = __glXnopEnterServer;
-static void (*__glXleaveServerFunc) (GLboolean) = __glXnopLeaveServer;
-
-void
-__glXsetEnterLeaveServerFuncs(void (*enter) (GLboolean),
-                              void (*leave) (GLboolean))
-{
-    __glXenterServerFunc = enter;
-    __glXleaveServerFunc = leave;
-}
-
-void
-__glXenterServer(GLboolean rendering)
-{
-    glxServerLeaveCount--;
-
-    if (glxServerLeaveCount == 0)
-        (*__glXenterServerFunc) (rendering);
-}
-
-void
-__glXleaveServer(GLboolean rendering)
-{
-    if (glxServerLeaveCount == 0)
-        (*__glXleaveServerFunc) (rendering);
-
-    glxServerLeaveCount++;
 }
 
 static glx_gpa_proc _get_proc_address;
@@ -635,13 +591,7 @@ __glXDispatch(ClientPtr client)
     proc = __glXGetProtocolDecodeFunction(&Single_dispatch_info, opcode,
                                           client->swapped);
     if (proc != NULL) {
-        GLboolean rendering = opcode <= X_GLXRenderLarge;
-
-        __glXleaveServer(rendering);
-
         retval = (*proc) (cl, (GLbyte *) stuff);
-
-        __glXenterServer(rendering);
     }
     else {
         retval = BadRequest;
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 9088ec4..e7ea8c2 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -107,11 +107,6 @@ enum {
     GLX_ALL_VISUALS
 };
 
-void __glXsetEnterLeaveServerFuncs(void (*enter) (GLboolean),
-                                   void (*leave) (GLboolean));
-void __glXenterServer(GLboolean rendering);
-void __glXleaveServer(GLboolean rendering);
-
 void glxSuspendClients(void);
 void glxResumeClients(void);
 
-- 
2.9.3