diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-05-31 00:34:49 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 22:08:13 +0100 |
| commit | 3bc01d1b8a253dcddf7072ec435fe655f22b79c5 (patch) | |
| tree | 2bfe6e083171c0408382649d42b229ead2b92338 | |
| parent | e5a93849bd63cde75c447ac0df5ddc44b408e51c (diff) | |
| download | nx-libs-3bc01d1b8a253dcddf7072ec435fe655f22b79c5.tar.gz nx-libs-3bc01d1b8a253dcddf7072ec435fe655f22b79c5.tar.bz2 nx-libs-3bc01d1b8a253dcddf7072ec435fe655f22b79c5.zip | |
NXrender.c: call upstream versions of (S)ProcRenderDispatch
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 59 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/render/render.c | 17 |
2 files changed, 41 insertions, 35 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index a7722fada..76a375db2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -1753,58 +1753,53 @@ static int ProcRenderCreateConicalGradient (ClientPtr client) static int ProcRenderDispatch (ClientPtr client) { - int result; - + #ifdef TEST REQUEST(xReq); if (stuff->data < RenderNumberRequests) { - #ifdef TEST - fprintf(stderr, "ProcRenderDispatch: Request [%s] OPCODE#%d.\n", + fprintf(stderr, "%s: Request [%s] OPCODE#%d.\n", __func__, nxagentRenderRequestLiteral[stuff->data], stuff->data); - #endif + } + #endif - /* - * Set the nxagentGCTrap flag while - * dispatching a render operation to - * avoid reentrancy in GCOps.c. - */ + /* + * Set the nxagentGCTrap flag while dispatching a render + * operation to avoid reentrancy in GCOps.c. + */ - nxagentGCTrap = 1; + nxagentGCTrap = 1; - result = (*ProcRenderVector[stuff->data]) (client); + int result = xorg_ProcRenderDispatch(client); - nxagentGCTrap = 0; + nxagentGCTrap = 0; - return result; - } - else - return BadRequest; + return result; } static int SProcRenderDispatch (ClientPtr client) { - int result; - + #ifdef TEST REQUEST(xReq); - + if (stuff->data < RenderNumberRequests) { - /* - * Set the nxagentGCTrap flag while - * dispatching a render operation to - * avoid reentrancy in GCOps.c. - */ + fprintf(stderr, "%s: Request [%s] OPCODE#%d.\n", __func__, + nxagentRenderRequestLiteral[stuff->data], stuff->data); + } + #endif - nxagentGCTrap = 1; + /* + * Set the nxagentGCTrap flag while dispatching a render + * operation to avoid reentrancy in GCOps.c. + */ - result = (*SProcRenderVector[stuff->data]) (client); + nxagentGCTrap = 1; - nxagentGCTrap = 0; + int result = xorg_SProcRenderDispatch(client); - return result; - } - else - return BadRequest; + nxagentGCTrap = 0; + + return result; } diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c index f0bc6a1c9..3dcbac0e6 100644 --- a/nx-X11/programs/Xserver/render/render.c +++ b/nx-X11/programs/Xserver/render/render.c @@ -126,6 +126,11 @@ static int SProcRenderCreateConicalGradient (ClientPtr pClient); static int SProcRenderDispatch (ClientPtr pClient); +#ifdef NXAGENT_SERVER +static int xorg_ProcRenderDispatch (ClientPtr pClient); +static int xorg_SProcRenderDispatch (ClientPtr pClient); +#endif + int (*ProcRenderVector[RenderNumberRequests])(ClientPtr) = { ProcRenderQueryVersion, ProcRenderQueryPictFormats, @@ -2022,10 +2027,15 @@ static int ProcRenderCreateConicalGradient (ClientPtr client) return BadAlloc; return Success; } +#endif /* NXAGENT_SERVER */ static int +#ifdef NXAGENT_SERVER +xorg_ProcRenderDispatch (ClientPtr client) +#else ProcRenderDispatch (ClientPtr client) +#endif { REQUEST(xReq); @@ -2034,7 +2044,6 @@ ProcRenderDispatch (ClientPtr client) else return BadRequest; } -#endif /* NXAGENT_SERVER */ static int SProcRenderQueryVersion (ClientPtr client) @@ -2606,9 +2615,12 @@ SProcRenderCreateConicalGradient (ClientPtr client) return (*ProcRenderVector[stuff->renderReqType]) (client); } -#ifndef NXAGENT_SERVER +#ifdef NXAGENT_SERVER static int +xorg_SProcRenderDispatch (ClientPtr client) +#else SProcRenderDispatch (ClientPtr client) +#endif { REQUEST(xReq); @@ -2617,7 +2629,6 @@ SProcRenderDispatch (ClientPtr client) else return BadRequest; } -#endif /* NXAGENT_SERVER */ #ifdef PANORAMIX #include "panoramiX.h" |