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

xv: inline SWriteImageFormatInfo()

Browse Source 
Instead of complex macro machinery, just move the conditional swapping
directly into ProcXvListImageFormats().

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-15 05:02:43 +02:00
committed by Enrico Weigelt
parent 26b0ad79ed
commit 25565daa42
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Xext/xvdisp.c
View File

@@ -54,28 +54,6 @@ SOFTWARE.
unsigned long XvXRTPort;
#endif /* XINERAMA */
static int
SWriteImageFormatInfo(ClientPtr client, xvImageFormatInfo * pImage)
{
swapl(&pImage->id);
swapl(&pImage->red_mask);
swapl(&pImage->green_mask);
swapl(&pImage->blue_mask);
swapl(&pImage->y_sample_bits);
swapl(&pImage->u_sample_bits);
swapl(&pImage->v_sample_bits);
swapl(&pImage->horz_y_period);
swapl(&pImage->horz_u_period);
swapl(&pImage->horz_v_period);
swapl(&pImage->vert_y_period);
swapl(&pImage->vert_u_period);
swapl(&pImage->vert_v_period);
WriteToClient(client, sz_xvImageFormatInfo, pImage);
return Success;
}
static int
SWriteGrabPortReply(ClientPtr client, xvGrabPortReply * rep)
{
@@ -178,10 +156,6 @@ SWriteListImageFormatsReply(ClientPtr client, xvListImageFormatsReply * rep)
if ((_c)->swapped) SWriteListImageFormatsReply(_c, _d); \
else WriteToClient(_c, sz_xvListImageFormatsReply, _d)
#define _WriteImageFormatInfo(_c,_d) \
if ((_c)->swapped) SWriteImageFormatInfo(_c, _d); \
else WriteToClient(_c, sz_xvImageFormatInfo, _d)
static int
ProcXvQueryExtension(ClientPtr client)
{
@@ -1014,7 +988,6 @@ ProcXvListImageFormats(ClientPtr client)
XvPortPtr pPort;
XvImagePtr pImage;
int i;
xvImageFormatInfo info;
REQUEST(xvListImageFormatsReq);
@@ -1035,6 +1008,7 @@ ProcXvListImageFormats(ClientPtr client)
pImage = pPort->pAdaptor->pImages;
for (i = 0; i < pPort->pAdaptor->nImages; i++, pImage++) {
xvImageFormatInfo info;
info.id = pImage->id;
info.type = pImage->type;
info.byte_order = pImage->byte_order;
@@ -1057,7 +1031,24 @@ ProcXvListImageFormats(ClientPtr client)
info.vert_v_period = pImage->vert_v_period;
memcpy(&info.comp_order, pImage->component_order, 32);
info.scanline_order = pImage->scanline_order;
_WriteImageFormatInfo(client, &info);
if (client->swapped) {
swapl(&info.id);
swapl(&info.red_mask);
swapl(&info.green_mask);
swapl(&info.blue_mask);
swapl(&info.y_sample_bits);
swapl(&info.u_sample_bits);
swapl(&info.v_sample_bits);
swapl(&info.horz_y_period);
swapl(&info.horz_u_period);
swapl(&info.horz_v_period);
swapl(&info.vert_y_period);
swapl(&info.vert_u_period);
swapl(&info.vert_v_period);
}
WriteToClient(client, sz_xvImageFormatInfo, &info);
}
return Success;