NXrender.c: call upstream versions of (S)ProcRenderDispatch

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;
 }

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"