From 141a96237f6bfb1f64458bc73d9911c87f6e29ac Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 8 Sep 2025 13:57:07 +0200
Subject: [PATCH] render: consolidate byte-swapping in ProcRenderQueryFilters()

No need for extra functions and call tables for the few trivial lines.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 render/render.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/render/render.c b/render/render.c
index df01c25711..530d91c606 100644
--- a/render/render.c
+++ b/render/render.c
@@ -112,7 +112,6 @@ static int SProcRenderFreeGlyphs(ClientPtr pClient);
 static int SProcRenderCompositeGlyphs(ClientPtr pClient);
 static int SProcRenderFillRectangles(ClientPtr pClient);
 static int SProcRenderSetPictureTransform(ClientPtr pClient);
-static int SProcRenderQueryFilters(ClientPtr pClient);
 static int SProcRenderSetPictureFilter(ClientPtr pClient);
 static int SProcRenderCreateAnimCursor(ClientPtr pClient);
 static int SProcRenderAddTraps(ClientPtr pClient);
@@ -191,7 +190,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
         SProcRenderFillRectangles,
         ProcRenderCreateCursor,
         SProcRenderSetPictureTransform,
-        SProcRenderQueryFilters,
+        ProcRenderQueryFilters,
         SProcRenderSetPictureFilter,
         SProcRenderCreateAnimCursor,
         SProcRenderAddTraps,
@@ -1602,6 +1601,11 @@ static int
 ProcRenderQueryFilters(ClientPtr client)
 {
     REQUEST(xRenderQueryFiltersReq);
+    REQUEST_SIZE_MATCH(xRenderQueryFiltersReq);
+
+    if (client->swapped)
+        swapl(&stuff->drawable);
+
     DrawablePtr pDrawable;
     int nbytesName;
     int nnames;
@@ -1611,7 +1615,6 @@ ProcRenderQueryFilters(ClientPtr client)
     INT16 *aliases;
     char *names;
 
-    REQUEST_SIZE_MATCH(xRenderQueryFiltersReq);
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
                            DixGetAttrAccess);
     if (rc != Success)
@@ -2239,16 +2242,6 @@ SProcRenderSetPictureTransform(ClientPtr client)
     return ProcRenderSetPictureTransform(client);
 }
 
-static int _X_COLD
-SProcRenderQueryFilters(ClientPtr client)
-{
-    REQUEST(xRenderQueryFiltersReq);
-    REQUEST_SIZE_MATCH(xRenderQueryFiltersReq);
-
-    swapl(&stuff->drawable);
-    return ProcRenderQueryFilters(client);
-}
-
 static int _X_COLD
 SProcRenderSetPictureFilter(ClientPtr client)
 {