From 3bc01d1b8a253dcddf7072ec435fe655f22b79c5 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 31 May 2019 00:34:49 +0200
Subject: NXrender.c: call upstream versions of (S)ProcRenderDispatch

---
 nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 59 ++++++++++++---------------
 1 file changed, 27 insertions(+), 32 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent')

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;
 }
-- 
cgit v1.2.3