diff --git a/render/render.c b/render/render.c
index d2d34fb4ff..ddf402fbfb 100644
--- a/render/render.c
+++ b/render/render.c
@@ -96,7 +96,6 @@ static int ProcRenderCreateConicalGradient(ClientPtr pClient);
 
 static int ProcRenderDispatch(ClientPtr pClient);
 
-static int SProcRenderCreatePicture(ClientPtr pClient);
 static int SProcRenderChangePicture(ClientPtr pClient);
 static int SProcRenderSetPictureClipRectangles(ClientPtr pClient);
 static int SProcRenderFreePicture(ClientPtr pClient);
@@ -162,7 +161,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
         ProcRenderQueryPictFormats,
         ProcRenderQueryPictIndexValues,
         _not_implemented, /* SProcRenderQueryDithers */
-        SProcRenderCreatePicture,
+        ProcRenderCreatePicture,
         SProcRenderChangePicture,
         SProcRenderSetPictureClipRectangles,
         SProcRenderFreePicture,
@@ -515,17 +514,13 @@ ProcRenderQueryPictIndexValues(ClientPtr client)
 }
 
 static int
-SingleRenderCreatePicture(ClientPtr client)
+SingleRenderCreatePicture(ClientPtr client, xRenderCreatePictureReq *stuff)
 {
     PicturePtr pPicture;
     DrawablePtr pDrawable;
     PictFormatPtr pFormat;
     int len, error, rc;
 
-    REQUEST(xRenderCreatePictureReq);
-
-    REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
-
     LEGAL_NEW_RESOURCE(stuff->pid, client);
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
                            DixReadAccess | DixAddAccess);
@@ -1946,19 +1941,6 @@ ProcRenderDispatch(ClientPtr client)
         return BadRequest;
 }
 
-static int _X_COLD
-SProcRenderCreatePicture(ClientPtr client)
-{
-    REQUEST(xRenderCreatePictureReq);
-    REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
-    swapl(&stuff->pid);
-    swapl(&stuff->drawable);
-    swapl(&stuff->format);
-    swapl(&stuff->mask);
-    SwapRestL(stuff);
-    return ProcRenderCreatePicture(client);
-}
-
 static int _X_COLD
 SProcRenderChangePicture(ClientPtr client)
 {
@@ -2383,13 +2365,11 @@ SProcRenderDispatch(ClientPtr client)
 int (*PanoramiXSaveRenderVector[RenderNumberRequests]) (ClientPtr);
 
 static int
-PanoramiXRenderCreatePicture(ClientPtr client)
+PanoramiXRenderCreatePicture(ClientPtr client, xRenderCreatePictureReq *stuff)
 {
-    REQUEST(xRenderCreatePictureReq);
     PanoramiXRes *refDraw, *newPict;
     int result;
 
-    REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
     result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable,
                                       XRC_DRAWABLE, client, DixWriteAccess);
     if (result != Success)
@@ -2409,7 +2389,7 @@ PanoramiXRenderCreatePicture(ClientPtr client)
     XINERAMA_FOR_EACH_SCREEN_BACKWARD({
         stuff->pid = newPict->info[walkScreenIdx].id;
         stuff->drawable = refDraw->info[walkScreenIdx].id;
-        result = SingleRenderCreatePicture(client);
+        result = SingleRenderCreatePicture(client, stuff);
         if (result != Success)
             break;
     });
@@ -3070,11 +3050,22 @@ PanoramiXRenderReset(void)
 static int
 ProcRenderCreatePicture(ClientPtr client)
 {
+    REQUEST(xRenderCreatePictureReq);
+    REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
+
+    if (client->swapped) {
+        swapl(&stuff->pid);
+        swapl(&stuff->drawable);
+        swapl(&stuff->format);
+        swapl(&stuff->mask);
+        SwapRestL(stuff);
+    }
+
 #ifdef XINERAMA
-    return (usePanoramiX ? PanoramiXRenderCreatePicture(client)
-                         : SingleRenderCreatePicture(client));
+    return (usePanoramiX ? PanoramiXRenderCreatePicture(client, stuff)
+                         : SingleRenderCreatePicture(client, stuff));
 #else
-    return SingleRenderCreatePicture(client);
+    return SingleRenderCreatePicture(client, stuff);
 #endif
 }