XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

render: consolidate byte-swapping in ProcRenderCreateLinearGradient()

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:59:41 +02:00
committed by Enrico Weigelt
parent d7eac08a22
commit 6057540a6c
1 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
render/render.c
View File

@@ -98,7 +98,6 @@ static int ProcRenderCreateConicalGradient(ClientPtr pClient);
static int ProcRenderDispatch(ClientPtr pClient);
static int SProcRenderCreateLinearGradient(ClientPtr pClient);
static int SProcRenderCreateRadialGradient(ClientPtr pClient);
static int SProcRenderCreateConicalGradient(ClientPtr pClient);
@@ -177,7 +176,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
ProcRenderCreateAnimCursor,
ProcRenderAddTraps,
ProcRenderCreateSolidFill,
SProcRenderCreateLinearGradient,
ProcRenderCreateLinearGradient,
SProcRenderCreateRadialGradient, SProcRenderCreateConicalGradient};
int RenderErrBase;
@@ -1798,7 +1797,7 @@ SingleRenderCreateSolidFill(ClientPtr client, xRenderCreateSolidFillReq *stuff)
}
static int
SingleRenderCreateLinearGradient(ClientPtr client)
SingleRenderCreateLinearGradient(ClientPtr client, xRenderCreateLinearGradientReq *stuff)
{
PicturePtr pPicture;
int len;
@@ -1806,10 +1805,6 @@ SingleRenderCreateLinearGradient(ClientPtr client)
xFixed *stops;
xRenderColor *colors;
REQUEST(xRenderCreateLinearGradientReq);
REQUEST_AT_LEAST_SIZE(xRenderCreateLinearGradientReq);
LEGAL_NEW_RESOURCE(stuff->pid, client);
len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq);
@@ -1945,32 +1940,6 @@ swapStops(void *stuff, int num)
}
}
static int _X_COLD
SProcRenderCreateLinearGradient(ClientPtr client)
{
int len;
REQUEST(xRenderCreateLinearGradientReq);
REQUEST_AT_LEAST_SIZE(xRenderCreateLinearGradientReq);
swapl(&stuff->pid);
swapl(&stuff->p1.x);
swapl(&stuff->p1.y);
swapl(&stuff->p2.x);
swapl(&stuff->p2.y);
swapl(&stuff->nStops);
len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq);
if (stuff->nStops > UINT32_MAX / (sizeof(xFixed) + sizeof(xRenderColor)))
return BadLength;
if (len != stuff->nStops * (sizeof(xFixed) + sizeof(xRenderColor)))
return BadLength;
swapStops(stuff + 1, stuff->nStops);
return ProcRenderCreateLinearGradient(client);
}
static int _X_COLD
SProcRenderCreateRadialGradient(ClientPtr client)
{
@@ -2585,14 +2554,12 @@ PanoramiXRenderCreateSolidFill(ClientPtr client, xRenderCreateSolidFillReq *stuf
}
static int
PanoramiXRenderCreateLinearGradient(ClientPtr client)
PanoramiXRenderCreateLinearGradient(ClientPtr client,
xRenderCreateLinearGradientReq *stuff)
{
REQUEST(xRenderCreateLinearGradientReq);
PanoramiXRes *newPict;
int result = Success;
REQUEST_AT_LEAST_SIZE(xRenderCreateLinearGradientReq);
if (!(newPict = calloc(1, sizeof(PanoramiXRes))))
return BadAlloc;
@@ -2602,7 +2569,7 @@ PanoramiXRenderCreateLinearGradient(ClientPtr client)
XINERAMA_FOR_EACH_SCREEN_BACKWARD({
stuff->pid = newPict->info[walkScreenIdx].id;
result = SingleRenderCreateLinearGradient(client);
result = SingleRenderCreateLinearGradient(client, stuff);
if (result != Success)
break;
});
@@ -3096,11 +3063,31 @@ ProcRenderCreateSolidFill(ClientPtr client)
static int
ProcRenderCreateLinearGradient(ClientPtr client)
{
REQUEST(xRenderCreateLinearGradientReq);
REQUEST_AT_LEAST_SIZE(xRenderCreateLinearGradientReq);
if (client->swapped) {
swapl(&stuff->pid);
swapl(&stuff->p1.x);
swapl(&stuff->p1.y);
swapl(&stuff->p2.x);
swapl(&stuff->p2.y);
swapl(&stuff->nStops);
int len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq);
if (stuff->nStops > UINT32_MAX / (sizeof(xFixed) + sizeof(xRenderColor)))
return BadLength;
if (len != stuff->nStops * (sizeof(xFixed) + sizeof(xRenderColor)))
return BadLength;
swapStops(stuff + 1, stuff->nStops);
}
#ifdef XINERAMA
return (usePanoramiX ? PanoramiXRenderCreateLinearGradient(client)
: SingleRenderCreateLinearGradient(client));
return (usePanoramiX ? PanoramiXRenderCreateLinearGradient(client, stuff)
: SingleRenderCreateLinearGradient(client, stuff));
#else
return SingleRenderCreateLinearGradient(client);
return SingleRenderCreateLinearGradient(client, stuff);
#endif
}