From b96cffc80e4d4c8c8e592d11a1627a871185f8af Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 8 Sep 2025 13:28:09 +0200 Subject: [PATCH] render: consolidate byte-swapping in ProcRenderReferenceGlyphSet() No need for extra functions and call tables for the few trivial lines. Signed-off-by: Enrico Weigelt, metux IT consult --- render/render.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/render/render.c b/render/render.c index df68143165..d2d34fb4ff 100644 --- a/render/render.c +++ b/render/render.c @@ -104,7 +104,6 @@ static int SProcRenderTrapezoids(ClientPtr pClient); static int SProcRenderTriangles(ClientPtr pClient); static int SProcRenderTriStrip(ClientPtr pClient); static int SProcRenderTriFan(ClientPtr pClient); -static int SProcRenderReferenceGlyphSet(ClientPtr pClient); static int SProcRenderFreeGlyphSet(ClientPtr pClient); static int SProcRenderAddGlyphs(ClientPtr pClient); static int SProcRenderFreeGlyphs(ClientPtr pClient); @@ -177,7 +176,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = { _not_implemented, /* SProcRenderColorTriangles */ _not_implemented, /* SProcRenderTransform */ ProcRenderCreateGlyphSet, - SProcRenderReferenceGlyphSet, + ProcRenderReferenceGlyphSet, SProcRenderFreeGlyphSet, SProcRenderAddGlyphs, _not_implemented, /* SProcRenderAddGlyphsFromPicture */ @@ -878,9 +877,13 @@ ProcRenderReferenceGlyphSet(ClientPtr client) int rc; REQUEST(xRenderReferenceGlyphSetReq); - REQUEST_SIZE_MATCH(xRenderReferenceGlyphSetReq); + if (client->swapped) { + swapl(&stuff->gsid); + swapl(&stuff->existing); + } + LEGAL_NEW_RESOURCE(stuff->gsid, client); rc = dixLookupResourceByType((void **) &glyphSet, stuff->existing, @@ -2048,16 +2051,6 @@ SProcRenderTriFan(ClientPtr client) return ProcRenderTriFan(client); } -static int _X_COLD -SProcRenderReferenceGlyphSet(ClientPtr client) -{ - REQUEST(xRenderReferenceGlyphSetReq); - REQUEST_SIZE_MATCH(xRenderReferenceGlyphSetReq); - swapl(&stuff->gsid); - swapl(&stuff->existing); - return ProcRenderReferenceGlyphSet(client); -} - static int _X_COLD SProcRenderFreeGlyphSet(ClientPtr client) {