xserver: Branch 'master'

[Adam Jackson]

 render/render.c |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 67dd34fa734085ed67ba7790820fe4743d48b60f
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jun 10 13:20:59 2015 -0400

    render: Simplify SProcRenderScale
    
    Since ProcRenderScale throws BadImplementation anyway it's pointless to
    waste time carefully swapping the request.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/render/render.c b/render/render.c
index 88d8a26..b777991 100644
--- a/render/render.c
+++ b/render/render.c
@@ -2099,20 +2099,7 @@ SProcRenderComposite(ClientPtr client)
 static int
 SProcRenderScale(ClientPtr client)
 {
-    REQUEST(xRenderScaleReq);
-    REQUEST_SIZE_MATCH(xRenderScaleReq);
-    swaps(&stuff->length);
-    swapl(&stuff->src);
-    swapl(&stuff->dst);
-    swapl(&stuff->colorScale);
-    swapl(&stuff->alphaScale);
-    swaps(&stuff->xSrc);
-    swaps(&stuff->ySrc);
-    swaps(&stuff->xDst);
-    swaps(&stuff->yDst);
-    swaps(&stuff->width);
-    swaps(&stuff->height);
-    return (*ProcRenderVector[stuff->renderReqType]) (client);
+    return BadImplementation;
 }
 
 static int