diff --git a/render/render.c b/render/render.c
index dcdadb9e36..645c77a8b5 100644
--- a/render/render.c
+++ b/render/render.c
@@ -105,7 +105,6 @@ static int SProcRenderTrapezoids(ClientPtr pClient);
 static int SProcRenderTriangles(ClientPtr pClient);
 static int SProcRenderTriStrip(ClientPtr pClient);
 static int SProcRenderTriFan(ClientPtr pClient);
-static int SProcRenderCreateGlyphSet(ClientPtr pClient);
 static int SProcRenderReferenceGlyphSet(ClientPtr pClient);
 static int SProcRenderFreeGlyphSet(ClientPtr pClient);
 static int SProcRenderAddGlyphs(ClientPtr pClient);
@@ -181,7 +180,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
         _not_implemented, /* SProcRenderColorTrapezoids */
         _not_implemented, /* SProcRenderColorTriangles */
         _not_implemented, /* SProcRenderTransform */
-        SProcRenderCreateGlyphSet,
+        ProcRenderCreateGlyphSet,
         SProcRenderReferenceGlyphSet,
         SProcRenderFreeGlyphSet,
         SProcRenderAddGlyphs,
@@ -832,9 +831,13 @@ ProcRenderCreateGlyphSet(ClientPtr client)
     int rc, f;
 
     REQUEST(xRenderCreateGlyphSetReq);
-
     REQUEST_SIZE_MATCH(xRenderCreateGlyphSetReq);
 
+    if (client->swapped) {
+        swapl(&stuff->gsid);
+        swapl(&stuff->format);
+    }
+
     LEGAL_NEW_RESOURCE(stuff->gsid, client);
     rc = dixLookupResourceByType((void **) &format, stuff->format,
                                  PictFormatType, client, DixReadAccess);
@@ -2053,16 +2056,6 @@ SProcRenderTriFan(ClientPtr client)
     return ProcRenderTriFan(client);
 }
 
-static int _X_COLD
-SProcRenderCreateGlyphSet(ClientPtr client)
-{
-    REQUEST(xRenderCreateGlyphSetReq);
-    REQUEST_SIZE_MATCH(xRenderCreateGlyphSetReq);
-    swapl(&stuff->gsid);
-    swapl(&stuff->format);
-    return ProcRenderCreateGlyphSet(client);
-}
-
 static int _X_COLD
 SProcRenderReferenceGlyphSet(ClientPtr client)
 {