diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-05-01 21:52:02 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:48:07 +0100 |
| commit | f3bddad4c69bc83f68b5f1118cb37752593b8c57 (patch) | |
| tree | be72db598a67613d9ca4cb37e900e09a55ba0ca5 /nx-X11/programs/Xserver/GL | |
| parent | eb8c16ef9d24add2e0912269775d586d7d4061e4 (diff) | |
| download | nx-libs-f3bddad4c69bc83f68b5f1118cb37752593b8c57.tar.gz nx-libs-f3bddad4c69bc83f68b5f1118cb37752593b8c57.tar.bz2 nx-libs-f3bddad4c69bc83f68b5f1118cb37752593b8c57.zip | |
NXglxext.c: use upstream versions of Dispatch functions
instead of a full copy. We still have our own function because we
need to handle the nxagentGlxTrap. This trap is now set before the
start of the dispatcher while it has been set only directly before
calling the dispatched function.
Saves ~50 duplicated lines.
Diffstat (limited to 'nx-X11/programs/Xserver/GL')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxext.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glxext.c b/nx-X11/programs/Xserver/GL/glx/glxext.c index 4f2d2082d..328b0a3cf 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxext.c +++ b/nx-X11/programs/Xserver/GL/glx/glxext.c @@ -387,12 +387,15 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag, /************************************************************************/ -#ifndef NXAGENT_SERVER /* ** Top level dispatcher; all commands are executed from here down. */ +#ifdef NXAGENT_SERVER +static int xorg__glXDispatch(ClientPtr client) +#else static int __glXDispatch(ClientPtr client) +#endif { REQUEST(xGLXSingleReq); CARD8 opcode; @@ -449,8 +452,6 @@ static int __glXDispatch(ClientPtr client) return (*proc)(cl, (GLbyte *) stuff); } -#endif /* NXAGENT_SERVER */ - int __glXNoSuchSingleOpcode(__GLXclientState *cl, GLbyte *pc) { |