XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

render: consolidate byte-swapping in ProcRenderFillRectangles()

Browse Source 
No need for extra functions and call tables for the few trivial lines.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-08 16:40:43 +02:00
committed by Enrico Weigelt
parent 7e8d887085
commit fb5274d7ac
1 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
render/render.c
View File

@@ -98,7 +98,6 @@ static int ProcRenderCreateConicalGradient(ClientPtr pClient);
static int ProcRenderDispatch(ClientPtr pClient);
static int SProcRenderFillRectangles(ClientPtr pClient);
static int SProcRenderSetPictureTransform(ClientPtr pClient);
static int SProcRenderSetPictureFilter(ClientPtr pClient);
static int SProcRenderAddTraps(ClientPtr pClient);
@@ -174,7 +173,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
ProcRenderCompositeGlyphs,
ProcRenderCompositeGlyphs,
ProcRenderCompositeGlyphs,
SProcRenderFillRectangles,
ProcRenderFillRectangles,
ProcRenderCreateCursor,
SProcRenderSetPictureTransform,
ProcRenderQueryFilters,
@@ -1324,14 +1323,11 @@ SingleRenderCompositeGlyphs(ClientPtr client, xRenderCompositeGlyphsReq *stuff)
}
static int
SingleRenderFillRectangles(ClientPtr client)
SingleRenderFillRectangles(ClientPtr client, xRenderFillRectanglesReq *stuff)
{
PicturePtr pDst;
int things;
REQUEST(xRenderFillRectanglesReq);
REQUEST_AT_LEAST_SIZE(xRenderFillRectanglesReq);
if (!PictOpValid(stuff->op)) {
client->errorValue = stuff->op;
return BadValue;
@@ -1944,21 +1940,6 @@ ProcRenderDispatch(ClientPtr client)
return BadRequest;
}
static int _X_COLD
SProcRenderFillRectangles(ClientPtr client)
{
REQUEST(xRenderFillRectanglesReq);
REQUEST_AT_LEAST_SIZE(xRenderFillRectanglesReq);
swapl(&stuff->dst);
swaps(&stuff->color.red);
swaps(&stuff->color.green);
swaps(&stuff->color.blue);
swaps(&stuff->color.alpha);
SwapRestS(stuff);
return ProcRenderFillRectangles(client);
}
static int _X_COLD
SProcRenderSetPictureTransform(ClientPtr client)
{
@@ -2364,16 +2345,13 @@ PanoramiXRenderCompositeGlyphs(ClientPtr client, xRenderCompositeGlyphsReq *stuf
}
static int
PanoramiXRenderFillRectangles(ClientPtr client)
PanoramiXRenderFillRectangles(ClientPtr client, xRenderFillRectanglesReq *stuff)
{
PanoramiXRes *dst;
int result = Success;
REQUEST(xRenderFillRectanglesReq);
char *extra;
int extra_len;
REQUEST_AT_LEAST_SIZE(xRenderFillRectanglesReq);
VERIFY_XIN_PICTURE(dst, stuff->dst, client, DixWriteAccess);
extra_len = (client->req_len << 2) - sizeof(xRenderFillRectanglesReq);
if (extra_len && (extra = calloc(1, extra_len))) {
@@ -2398,7 +2376,7 @@ PanoramiXRenderFillRectangles(ClientPtr client)
}
}
stuff->dst = dst->info[walkScreenIdx].id;
result = SingleRenderFillRectangles(client);
result = SingleRenderFillRectangles(client, stuff);
if (result != Success)
break;
});
@@ -3090,11 +3068,23 @@ ProcRenderCompositeGlyphs(ClientPtr client)
static int
ProcRenderFillRectangles(ClientPtr client)
{
REQUEST(xRenderFillRectanglesReq);
REQUEST_AT_LEAST_SIZE(xRenderFillRectanglesReq);
if (client->swapped) {
swapl(&stuff->dst);
swaps(&stuff->color.red);
swaps(&stuff->color.green);
swaps(&stuff->color.blue);
swaps(&stuff->color.alpha);
SwapRestS(stuff);
}
#ifdef XINERAMA
return (usePanoramiX ? PanoramiXRenderFillRectangles(client)
: SingleRenderFillRectangles(client));
return (usePanoramiX ? PanoramiXRenderFillRectangles(client, stuff)
: SingleRenderFillRectangles(client, stuff));
#else
return SingleRenderFillRectangles(client);
return SingleRenderFillRectangles(client, stuff);
#endif
}