From c046c7629e771483a8b0677b5c34e330cda49ae6 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 26 Sep 2025 14:40:59 +0200
Subject: [PATCH] dix: inline SProcPolyText()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/dispatch.c    | 11 ++++++++++-
 dix/swapreq.c     | 14 --------------
 dix/tables.c      |  4 ++--
 include/swapreq.h |  1 -
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 9e8277fd3..c51cfa7d6 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2423,10 +2423,19 @@ int
 ProcPolyText(ClientPtr client)
 {
     REQUEST(xPolyTextReq);
+    REQUEST_AT_LEAST_SIZE(xPolyTextReq);
+
+    if (client->swapped) {
+        swapl(&stuff->drawable);
+        swapl(&stuff->gc);
+        swaps(&stuff->x);
+        swaps(&stuff->y);
+    }
+
+    int err;
     DrawablePtr pDraw;
     GCPtr pGC;
 
-    REQUEST_AT_LEAST_SIZE(xPolyTextReq);
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
     return PolyText(client,
diff --git a/dix/swapreq.c b/dix/swapreq.c
index cd2db89ea..646b68487 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -600,20 +600,6 @@ SProcGetImage(ClientPtr client)
     return ((*ProcVector[X_GetImage]) (client));
 }
 
-/* ProcPolyText used for both PolyText8 and PolyText16 */
-
-int _X_COLD
-SProcPolyText(ClientPtr client)
-{
-    REQUEST(xPolyTextReq);
-    REQUEST_AT_LEAST_SIZE(xPolyTextReq);
-    swapl(&stuff->drawable);
-    swapl(&stuff->gc);
-    swaps(&stuff->x);
-    swaps(&stuff->y);
-    return ((*ProcVector[stuff->reqType]) (client));
-}
-
 /* ProcImageText used for both ImageText8 and ImageText16 */
 
 int _X_COLD
diff --git a/dix/tables.c b/dix/tables.c
index 2c17cac51..9b3b79c1a 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -405,8 +405,8 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
     ProcPolyFillArc,
     SProcPutImage,
     SProcGetImage,
-    SProcPolyText,
-    SProcPolyText,                      /* 75 */
+    ProcPolyText,
+    ProcPolyText,                       /* 75 */
     SProcImageText,
     SProcImageText,
     SProcCreateColormap,
diff --git a/include/swapreq.h b/include/swapreq.h
index 453f5ebb7..0bbedce85 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -66,7 +66,6 @@ int SProcListFonts(ClientPtr client);
 int SProcListFontsWithInfo(ClientPtr client);
 int SProcLookupColor(ClientPtr client);
 int SProcOpenFont(ClientPtr client);
-int SProcPolyText(ClientPtr client);
 int SProcPutImage(ClientPtr client);
 int SProcQueryBestSize(ClientPtr client);
 int SProcQueryColors(ClientPtr client);