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 ProcRenderTriangles()

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:18:51 +02:00
committed by Enrico Weigelt
parent a41273572f
commit 0a5815b075
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 SProcRenderTriangles(ClientPtr pClient);
static int SProcRenderTriStrip(ClientPtr pClient);
static int SProcRenderTriFan(ClientPtr pClient);
static int SProcRenderCompositeGlyphs(ClientPtr pClient);
@@ -163,7 +162,7 @@ int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
ProcRenderComposite,
_not_implemented, /* SProcRenderScale */
ProcRenderTrapezoids,
SProcRenderTriangles,
ProcRenderTriangles,
SProcRenderTriStrip,
SProcRenderTriFan,
_not_implemented, /* SProcRenderColorTrapezoids */
@@ -681,15 +680,12 @@ SingleRenderTrapezoids(ClientPtr client, xRenderTrapezoidsReq *stuff)
}
static int
SingleRenderTriangles(ClientPtr client)
SingleRenderTriangles(ClientPtr client, xRenderTrianglesReq *stuff)
{
int rc, ntris;
PicturePtr pSrc, pDst;
PictFormatPtr pFormat;
REQUEST(xRenderTrianglesReq);
REQUEST_AT_LEAST_SIZE(xRenderTrianglesReq);
if (!PictOpValid(stuff->op)) {
client->errorValue = stuff->op;
return BadValue;
@@ -1961,21 +1957,6 @@ ProcRenderDispatch(ClientPtr client)
return BadRequest;
}
static int _X_COLD
SProcRenderTriangles(ClientPtr client)
{
REQUEST(xRenderTrianglesReq);
REQUEST_AT_LEAST_SIZE(xRenderTrianglesReq);
swapl(&stuff->src);
swapl(&stuff->dst);
swapl(&stuff->maskFormat);
swaps(&stuff->xSrc);
swaps(&stuff->ySrc);
SwapRestL(stuff);
return ProcRenderTriangles(client);
}
static int _X_COLD
SProcRenderTriStrip(ClientPtr client)
{
@@ -2612,17 +2593,14 @@ PanoramiXRenderTrapezoids(ClientPtr client, xRenderTrapezoidsReq *stuff)
}
static int
PanoramiXRenderTriangles(ClientPtr client)
PanoramiXRenderTriangles(ClientPtr client, xRenderTrianglesReq *stuff)
{
PanoramiXRes *src, *dst;
int result = Success;
REQUEST(xRenderTrianglesReq);
char *extra;
int extra_len;
REQUEST_AT_LEAST_SIZE(xRenderTrianglesReq);
VERIFY_XIN_PICTURE(src, stuff->src, client, DixReadAccess);
VERIFY_XIN_PICTURE(dst, stuff->dst, client, DixWriteAccess);
@@ -2656,7 +2634,7 @@ PanoramiXRenderTriangles(ClientPtr client)
stuff->src = src->info[walkScreenIdx].id;
stuff->dst = dst->info[walkScreenIdx].id;
result = SingleRenderTriangles(client);
result = SingleRenderTriangles(client, stuff);
if (result != Success)
break;
@@ -3091,11 +3069,23 @@ ProcRenderTrapezoids(ClientPtr client)
static int
ProcRenderTriangles(ClientPtr client)
{
REQUEST(xRenderTrianglesReq);
REQUEST_AT_LEAST_SIZE(xRenderTrianglesReq);
if (client->swapped) {
swapl(&stuff->src);
swapl(&stuff->dst);
swapl(&stuff->maskFormat);
swaps(&stuff->xSrc);
swaps(&stuff->ySrc);
SwapRestL(stuff);
}
#ifdef XINERAMA
return (usePanoramiX ? PanoramiXRenderTriangles(client)
: SingleRenderTriangles(client));
return (usePanoramiX ? PanoramiXRenderTriangles(client, stuff)
: SingleRenderTriangles(client, stuff));
#else
return SingleRenderTriangles(client);
return SingleRenderTriangles(client, stuff);
#endif
}