(submit/fixup-req-len) render: drop swapping request length fields
The request struct's length fields aren't used anymore - we have the client->req_len field instead, which also is bigreq-compatible. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									c8e226bff4
								
							
						
					
					
						commit
						9e70752722
					
				| 
						 | 
				
			
			@ -2005,7 +2005,6 @@ SProcRenderQueryVersion(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderQueryVersionReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->majorVersion);
 | 
			
		||||
    swapl(&stuff->minorVersion);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
| 
						 | 
				
			
			@ -2016,7 +2015,6 @@ SProcRenderQueryPictFormats(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderQueryPictFormatsReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderQueryPictFormatsReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -2025,7 +2023,6 @@ SProcRenderQueryPictIndexValues(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderQueryPictIndexValuesReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderQueryPictIndexValuesReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->format);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -2041,7 +2038,6 @@ SProcRenderCreatePicture(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderCreatePictureReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->pid);
 | 
			
		||||
    swapl(&stuff->drawable);
 | 
			
		||||
    swapl(&stuff->format);
 | 
			
		||||
| 
						 | 
				
			
			@ -2055,7 +2051,6 @@ SProcRenderChangePicture(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderChangePictureReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderChangePictureReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->picture);
 | 
			
		||||
    swapl(&stuff->mask);
 | 
			
		||||
    SwapRestL(stuff);
 | 
			
		||||
| 
						 | 
				
			
			@ -2067,7 +2062,6 @@ SProcRenderSetPictureClipRectangles(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderSetPictureClipRectanglesReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->picture);
 | 
			
		||||
    swaps(&stuff->xOrigin);
 | 
			
		||||
    swaps(&stuff->yOrigin);
 | 
			
		||||
| 
						 | 
				
			
			@ -2080,7 +2074,6 @@ SProcRenderFreePicture(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderFreePictureReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderFreePictureReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->picture);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -2090,7 +2083,6 @@ SProcRenderComposite(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderCompositeReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderCompositeReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->src);
 | 
			
		||||
    swapl(&stuff->mask);
 | 
			
		||||
    swapl(&stuff->dst);
 | 
			
		||||
| 
						 | 
				
			
			@ -2117,7 +2109,6 @@ SProcRenderTrapezoids(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderTrapezoidsReq);
 | 
			
		||||
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderTrapezoidsReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->src);
 | 
			
		||||
    swapl(&stuff->dst);
 | 
			
		||||
    swapl(&stuff->maskFormat);
 | 
			
		||||
| 
						 | 
				
			
			@ -2133,7 +2124,6 @@ SProcRenderTriangles(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderTrianglesReq);
 | 
			
		||||
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderTrianglesReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->src);
 | 
			
		||||
    swapl(&stuff->dst);
 | 
			
		||||
    swapl(&stuff->maskFormat);
 | 
			
		||||
| 
						 | 
				
			
			@ -2149,7 +2139,6 @@ SProcRenderTriStrip(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderTriStripReq);
 | 
			
		||||
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderTriStripReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->src);
 | 
			
		||||
    swapl(&stuff->dst);
 | 
			
		||||
    swapl(&stuff->maskFormat);
 | 
			
		||||
| 
						 | 
				
			
			@ -2165,7 +2154,6 @@ SProcRenderTriFan(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderTriFanReq);
 | 
			
		||||
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderTriFanReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->src);
 | 
			
		||||
    swapl(&stuff->dst);
 | 
			
		||||
    swapl(&stuff->maskFormat);
 | 
			
		||||
| 
						 | 
				
			
			@ -2198,7 +2186,6 @@ SProcRenderCreateGlyphSet(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderCreateGlyphSetReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderCreateGlyphSetReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->gsid);
 | 
			
		||||
    swapl(&stuff->format);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
| 
						 | 
				
			
			@ -2209,7 +2196,6 @@ SProcRenderReferenceGlyphSet(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderReferenceGlyphSetReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderReferenceGlyphSetReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->gsid);
 | 
			
		||||
    swapl(&stuff->existing);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
| 
						 | 
				
			
			@ -2220,7 +2206,6 @@ SProcRenderFreeGlyphSet(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderFreeGlyphSetReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->glyphset);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -2235,7 +2220,6 @@ SProcRenderAddGlyphs(ClientPtr client)
 | 
			
		|||
 | 
			
		||||
    REQUEST(xRenderAddGlyphsReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->glyphset);
 | 
			
		||||
    swapl(&stuff->nglyphs);
 | 
			
		||||
    if (stuff->nglyphs & 0xe0000000)
 | 
			
		||||
| 
						 | 
				
			
			@ -2270,7 +2254,6 @@ SProcRenderFreeGlyphs(ClientPtr client)
 | 
			
		|||
{
 | 
			
		||||
    REQUEST(xRenderFreeGlyphsReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->glyphset);
 | 
			
		||||
    SwapRestL(stuff);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
| 
						 | 
				
			
			@ -2301,7 +2284,6 @@ SProcRenderCompositeGlyphs(ClientPtr client)
 | 
			
		|||
        break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->src);
 | 
			
		||||
    swapl(&stuff->dst);
 | 
			
		||||
    swapl(&stuff->maskFormat);
 | 
			
		||||
| 
						 | 
				
			
			@ -2363,7 +2345,6 @@ SProcRenderFillRectangles(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderFillRectanglesReq);
 | 
			
		||||
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderFillRectanglesReq);
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->dst);
 | 
			
		||||
    swaps(&stuff->color.red);
 | 
			
		||||
    swaps(&stuff->color.green);
 | 
			
		||||
| 
						 | 
				
			
			@ -2379,7 +2360,6 @@ SProcRenderCreateCursor(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderCreateCursorReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderCreateCursorReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->cid);
 | 
			
		||||
    swapl(&stuff->src);
 | 
			
		||||
    swaps(&stuff->x);
 | 
			
		||||
| 
						 | 
				
			
			@ -2393,7 +2373,6 @@ SProcRenderSetPictureTransform(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderSetPictureTransformReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderSetPictureTransformReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->picture);
 | 
			
		||||
    swapl(&stuff->transform.matrix11);
 | 
			
		||||
    swapl(&stuff->transform.matrix12);
 | 
			
		||||
| 
						 | 
				
			
			@ -2413,7 +2392,6 @@ SProcRenderQueryFilters(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderQueryFiltersReq);
 | 
			
		||||
    REQUEST_SIZE_MATCH(xRenderQueryFiltersReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->drawable);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -2424,7 +2402,6 @@ SProcRenderSetPictureFilter(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderSetPictureFilterReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->picture);
 | 
			
		||||
    swaps(&stuff->nbytes);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
| 
						 | 
				
			
			@ -2436,7 +2413,6 @@ SProcRenderCreateAnimCursor(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderCreateAnimCursorReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderCreateAnimCursorReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->cid);
 | 
			
		||||
    SwapRestL(stuff);
 | 
			
		||||
    return (*ProcRenderVector[stuff->renderReqType]) (client);
 | 
			
		||||
| 
						 | 
				
			
			@ -2448,7 +2424,6 @@ SProcRenderAddTraps(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderAddTrapsReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderAddTrapsReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->picture);
 | 
			
		||||
    swaps(&stuff->xOff);
 | 
			
		||||
    swaps(&stuff->yOff);
 | 
			
		||||
| 
						 | 
				
			
			@ -2462,7 +2437,6 @@ SProcRenderCreateSolidFill(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderCreateSolidFillReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderCreateSolidFillReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->pid);
 | 
			
		||||
    swaps(&stuff->color.alpha);
 | 
			
		||||
    swaps(&stuff->color.red);
 | 
			
		||||
| 
						 | 
				
			
			@ -2498,7 +2472,6 @@ SProcRenderCreateLinearGradient(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderCreateLinearGradientReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderCreateLinearGradientReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->pid);
 | 
			
		||||
    swapl(&stuff->p1.x);
 | 
			
		||||
    swapl(&stuff->p1.y);
 | 
			
		||||
| 
						 | 
				
			
			@ -2525,7 +2498,6 @@ SProcRenderCreateRadialGradient(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderCreateRadialGradientReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderCreateRadialGradientReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->pid);
 | 
			
		||||
    swapl(&stuff->inner.x);
 | 
			
		||||
    swapl(&stuff->inner.y);
 | 
			
		||||
| 
						 | 
				
			
			@ -2554,7 +2526,6 @@ SProcRenderCreateConicalGradient(ClientPtr client)
 | 
			
		|||
    REQUEST(xRenderCreateConicalGradientReq);
 | 
			
		||||
    REQUEST_AT_LEAST_SIZE(xRenderCreateConicalGradientReq);
 | 
			
		||||
 | 
			
		||||
    swaps(&stuff->length);
 | 
			
		||||
    swapl(&stuff->pid);
 | 
			
		||||
    swapl(&stuff->center.x);
 | 
			
		||||
    swapl(&stuff->center.y);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue