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

render: consolidate byte-swapping in ProcRenderTrapezoids()

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:13:31 +02:00
committed by Enrico Weigelt
parent 24c422177f
commit bff6f86afc
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

@@ -97,7 +97,6 @@ static int ProcRenderCreateConicalGradient(ClientPtr pClient);
static int ProcRenderDispatch(ClientPtr pClient);
static int SProcRenderTrapezoids(ClientPtr pClient);
static int SProcRenderTriangles(ClientPtr pClient);
static int SProcRenderTriStrip(ClientPtr pClient);
static int SProcRenderTriFan(ClientPtr pClient);
@@ -162,7 +161,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
ProcRenderFreePicture,
ProcRenderComposite,
_not_implemented, /* SProcRenderScale */
SProcRenderTrapezoids,
ProcRenderTrapezoids,
SProcRenderTriangles,
SProcRenderTriStrip,
SProcRenderTriFan,
@@ -645,15 +644,12 @@ SingleRenderComposite(ClientPtr client, xRenderCompositeReq *stuff)
}
static int
SingleRenderTrapezoids(ClientPtr client)
SingleRenderTrapezoids(ClientPtr client, xRenderTrapezoidsReq *stuff)
{
int rc, ntraps;
PicturePtr pSrc, pDst;
PictFormatPtr pFormat;
REQUEST(xRenderTrapezoidsReq);
REQUEST_AT_LEAST_SIZE(xRenderTrapezoidsReq);
if (!PictOpValid(stuff->op)) {
client->errorValue = stuff->op;
return BadValue;
@@ -1965,21 +1961,6 @@ ProcRenderDispatch(ClientPtr client)
return BadRequest;
}
static int _X_COLD
SProcRenderTrapezoids(ClientPtr client)
{
REQUEST(xRenderTrapezoidsReq);
REQUEST_AT_LEAST_SIZE(xRenderTrapezoidsReq);
swapl(&stuff->src);
swapl(&stuff->dst);
swapl(&stuff->maskFormat);
swaps(&stuff->xSrc);
swaps(&stuff->ySrc);
SwapRestL(stuff);
return ProcRenderTrapezoids(client);
}
static int _X_COLD
SProcRenderTriangles(ClientPtr client)
{
@@ -2573,17 +2554,14 @@ PanoramiXRenderFillRectangles(ClientPtr client)
}
static int
PanoramiXRenderTrapezoids(ClientPtr client)
PanoramiXRenderTrapezoids(ClientPtr client, xRenderTrapezoidsReq *stuff)
{
PanoramiXRes *src, *dst;
int result = Success;
REQUEST(xRenderTrapezoidsReq);
char *extra;
int extra_len;
REQUEST_AT_LEAST_SIZE(xRenderTrapezoidsReq);
VERIFY_XIN_PICTURE(src, stuff->src, client, DixReadAccess);
VERIFY_XIN_PICTURE(dst, stuff->dst, client, DixWriteAccess);
@@ -2621,7 +2599,7 @@ PanoramiXRenderTrapezoids(ClientPtr client)
stuff->src = src->info[walkScreenIdx].id;
stuff->dst = dst->info[walkScreenIdx].id;
result = SingleRenderTrapezoids(client);
result = SingleRenderTrapezoids(client, stuff);
if (result != Success)
break;
@@ -3090,11 +3068,23 @@ ProcRenderComposite(ClientPtr client)
static int
ProcRenderTrapezoids(ClientPtr client)
{
REQUEST(xRenderTrapezoidsReq);
REQUEST_AT_LEAST_SIZE(xRenderTrapezoidsReq);
if (client->swapped) {
swapl(&stuff->src);
swapl(&stuff->dst);
swapl(&stuff->maskFormat);
swaps(&stuff->xSrc);
swaps(&stuff->ySrc);
SwapRestL(stuff);
}
#ifdef XINERAMA
return (usePanoramiX ? PanoramiXRenderTrapezoids(client)
: SingleRenderTrapezoids(client));
return (usePanoramiX ? PanoramiXRenderTrapezoids(client, stuff)
: SingleRenderTrapezoids(client, stuff));
#else
return SingleRenderTrapezoids(client);
return SingleRenderTrapezoids(client, stuff);
#endif
}