mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
glx: replace __GLX_SWAP_INT() by swapl()
We have an optimized function for this, so use it.
This commit is contained in:
committed by
Enrico Weigelt
parent
d438dfc677
commit
c339338277
@@ -56,13 +56,11 @@ __glXDispSwap_CreateContext(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXCreateContextReq *req = (xGLXCreateContextReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
__GLX_SWAP_INT(&req->visual);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->shareList);
|
||||
swapl(&req->context);
|
||||
swapl(&req->visual);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->shareList);
|
||||
|
||||
return __glXDisp_CreateContext(cl, pc);
|
||||
}
|
||||
@@ -72,14 +70,12 @@ __glXDispSwap_CreateNewContext(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXCreateNewContextReq *req = (xGLXCreateNewContextReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
__GLX_SWAP_INT(&req->fbconfig);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->renderType);
|
||||
__GLX_SWAP_INT(&req->shareList);
|
||||
swapl(&req->context);
|
||||
swapl(&req->fbconfig);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->renderType);
|
||||
swapl(&req->shareList);
|
||||
|
||||
return __glXDisp_CreateNewContext(cl, pc);
|
||||
}
|
||||
@@ -90,16 +86,15 @@ __glXDispSwap_CreateContextWithConfigSGIX(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXCreateContextWithConfigSGIXReq *req =
|
||||
(xGLXCreateContextWithConfigSGIXReq *) pc;
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_SIZE_MATCH(xGLXCreateContextWithConfigSGIXReq);
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
__GLX_SWAP_INT(&req->fbconfig);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->renderType);
|
||||
__GLX_SWAP_INT(&req->shareList);
|
||||
swapl(&req->context);
|
||||
swapl(&req->fbconfig);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->renderType);
|
||||
swapl(&req->shareList);
|
||||
|
||||
return __glXDisp_CreateContextWithConfigSGIX(cl, pc);
|
||||
}
|
||||
@@ -109,10 +104,8 @@ __glXDispSwap_DestroyContext(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXDestroyContextReq *req = (xGLXDestroyContextReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
swapl(&req->context);
|
||||
|
||||
return __glXDisp_DestroyContext(cl, pc);
|
||||
}
|
||||
@@ -140,10 +133,8 @@ __glXDispSwap_IsDirect(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXIsDirectReq *req = (xGLXIsDirectReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
swapl(&req->context);
|
||||
|
||||
return __glXDisp_IsDirect(cl, pc);
|
||||
}
|
||||
@@ -153,11 +144,9 @@ __glXDispSwap_QueryVersion(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXQueryVersionReq *req = (xGLXQueryVersionReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->majorVersion);
|
||||
__GLX_SWAP_INT(&req->minorVersion);
|
||||
swapl(&req->majorVersion);
|
||||
swapl(&req->minorVersion);
|
||||
|
||||
return __glXDisp_QueryVersion(cl, pc);
|
||||
}
|
||||
@@ -167,10 +156,8 @@ __glXDispSwap_WaitGL(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXWaitGLReq *req = (xGLXWaitGLReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
swapl(&req->contextTag);
|
||||
|
||||
return __glXDisp_WaitGL(cl, pc);
|
||||
}
|
||||
@@ -180,10 +167,8 @@ __glXDispSwap_WaitX(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXWaitXReq *req = (xGLXWaitXReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
swapl(&req->contextTag);
|
||||
|
||||
return __glXDisp_WaitX(cl, pc);
|
||||
}
|
||||
@@ -193,12 +178,10 @@ __glXDispSwap_CopyContext(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXCopyContextReq *req = (xGLXCopyContextReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->source);
|
||||
__GLX_SWAP_INT(&req->dest);
|
||||
__GLX_SWAP_INT(&req->mask);
|
||||
swapl(&req->source);
|
||||
swapl(&req->dest);
|
||||
swapl(&req->mask);
|
||||
|
||||
return __glXDisp_CopyContext(cl, pc);
|
||||
}
|
||||
@@ -208,9 +191,7 @@ __glXDispSwap_GetVisualConfigs(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXGetVisualConfigsReq *req = (xGLXGetVisualConfigsReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
swapl(&req->screen);
|
||||
return __glXDisp_GetVisualConfigs(cl, pc);
|
||||
}
|
||||
|
||||
@@ -219,9 +200,7 @@ __glXDispSwap_GetFBConfigs(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXGetFBConfigsReq *req = (xGLXGetFBConfigsReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
swapl(&req->screen);
|
||||
return __glXDisp_GetFBConfigs(cl, pc);
|
||||
}
|
||||
|
||||
@@ -231,11 +210,9 @@ __glXDispSwap_GetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXGetFBConfigsSGIXReq *req = (xGLXGetFBConfigsSGIXReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXGetFBConfigsSGIXReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
swapl(&req->screen);
|
||||
return __glXDisp_GetFBConfigsSGIX(cl, pc);
|
||||
}
|
||||
|
||||
@@ -244,13 +221,11 @@ __glXDispSwap_CreateGLXPixmap(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXCreateGLXPixmapReq *req = (xGLXCreateGLXPixmapReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->visual);
|
||||
__GLX_SWAP_INT(&req->pixmap);
|
||||
__GLX_SWAP_INT(&req->glxpixmap);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->visual);
|
||||
swapl(&req->pixmap);
|
||||
swapl(&req->glxpixmap);
|
||||
|
||||
return __glXDisp_CreateGLXPixmap(cl, pc);
|
||||
}
|
||||
@@ -262,16 +237,14 @@ __glXDispSwap_CreatePixmap(__GLXclientState * cl, GLbyte * pc)
|
||||
xGLXCreatePixmapReq *req = (xGLXCreatePixmapReq *) pc;
|
||||
CARD32 *attribs;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXCreatePixmapReq);
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->fbconfig);
|
||||
__GLX_SWAP_INT(&req->pixmap);
|
||||
__GLX_SWAP_INT(&req->glxpixmap);
|
||||
__GLX_SWAP_INT(&req->numAttribs);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->fbconfig);
|
||||
swapl(&req->pixmap);
|
||||
swapl(&req->glxpixmap);
|
||||
swapl(&req->numAttribs);
|
||||
|
||||
if (req->numAttribs > (UINT32_MAX >> 3)) {
|
||||
client->errorValue = req->numAttribs;
|
||||
@@ -290,15 +263,14 @@ __glXDispSwap_CreateGLXPixmapWithConfigSGIX(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXCreateGLXPixmapWithConfigSGIXReq *req =
|
||||
(xGLXCreateGLXPixmapWithConfigSGIXReq *) pc;
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_SIZE_MATCH(xGLXCreateGLXPixmapWithConfigSGIXReq);
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->fbconfig);
|
||||
__GLX_SWAP_INT(&req->pixmap);
|
||||
__GLX_SWAP_INT(&req->glxpixmap);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->fbconfig);
|
||||
swapl(&req->pixmap);
|
||||
swapl(&req->glxpixmap);
|
||||
|
||||
return __glXDisp_CreateGLXPixmapWithConfigSGIX(cl, pc);
|
||||
}
|
||||
@@ -308,10 +280,8 @@ __glXDispSwap_DestroyGLXPixmap(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXDestroyGLXPixmapReq *req = (xGLXDestroyGLXPixmapReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->glxpixmap);
|
||||
swapl(&req->glxpixmap);
|
||||
|
||||
return __glXDisp_DestroyGLXPixmap(cl, pc);
|
||||
}
|
||||
@@ -322,12 +292,10 @@ __glXDispSwap_DestroyPixmap(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXDestroyGLXPixmapReq *req = (xGLXDestroyGLXPixmapReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXDestroyGLXPixmapReq);
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->glxpixmap);
|
||||
swapl(&req->glxpixmap);
|
||||
|
||||
return __glXDisp_DestroyGLXPixmap(cl, pc);
|
||||
}
|
||||
@@ -337,9 +305,7 @@ __glXDispSwap_QueryContext(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXQueryContextReq *req = (xGLXQueryContextReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
swapl(&req->context);
|
||||
|
||||
return __glXDisp_QueryContext(cl, pc);
|
||||
}
|
||||
@@ -350,15 +316,14 @@ __glXDispSwap_CreatePbuffer(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXCreatePbufferReq *req = (xGLXCreatePbufferReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
CARD32 *attribs;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXCreatePbufferReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->fbconfig);
|
||||
__GLX_SWAP_INT(&req->pbuffer);
|
||||
__GLX_SWAP_INT(&req->numAttribs);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->fbconfig);
|
||||
swapl(&req->pbuffer);
|
||||
swapl(&req->numAttribs);
|
||||
|
||||
if (req->numAttribs > (UINT32_MAX >> 3)) {
|
||||
client->errorValue = req->numAttribs;
|
||||
@@ -377,15 +342,13 @@ __glXDispSwap_CreateGLXPbufferSGIX(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXCreateGLXPbufferSGIXReq *req = (xGLXCreateGLXPbufferSGIXReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXCreateGLXPbufferSGIXReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->fbconfig);
|
||||
__GLX_SWAP_INT(&req->pbuffer);
|
||||
__GLX_SWAP_INT(&req->width);
|
||||
__GLX_SWAP_INT(&req->height);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->fbconfig);
|
||||
swapl(&req->pbuffer);
|
||||
swapl(&req->width);
|
||||
swapl(&req->height);
|
||||
|
||||
return __glXDisp_CreateGLXPbufferSGIX(cl, pc);
|
||||
}
|
||||
@@ -395,9 +358,7 @@ __glXDispSwap_DestroyPbuffer(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXDestroyPbufferReq *req = (xGLXDestroyPbufferReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
__GLX_SWAP_INT(&req->pbuffer);
|
||||
swapl(&req->pbuffer);
|
||||
|
||||
return __glXDisp_DestroyPbuffer(cl, pc);
|
||||
}
|
||||
@@ -408,11 +369,9 @@ __glXDispSwap_DestroyGLXPbufferSGIX(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXDestroyGLXPbufferSGIXReq *req = (xGLXDestroyGLXPbufferSGIXReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_SIZE_MATCH(xGLXDestroyGLXPbufferSGIXReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->pbuffer);
|
||||
swapl(&req->pbuffer);
|
||||
|
||||
return __glXDisp_DestroyGLXPbufferSGIX(cl, pc);
|
||||
}
|
||||
@@ -423,13 +382,12 @@ __glXDispSwap_ChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXChangeDrawableAttributesReq *req =
|
||||
(xGLXChangeDrawableAttributesReq *) pc;
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
CARD32 *attribs;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXChangeDrawableAttributesReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->drawable);
|
||||
__GLX_SWAP_INT(&req->numAttribs);
|
||||
swapl(&req->drawable);
|
||||
swapl(&req->numAttribs);
|
||||
|
||||
if (req->numAttribs > (UINT32_MAX >> 3)) {
|
||||
client->errorValue = req->numAttribs;
|
||||
@@ -451,13 +409,12 @@ __glXDispSwap_ChangeDrawableAttributesSGIX(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXChangeDrawableAttributesSGIXReq *req =
|
||||
(xGLXChangeDrawableAttributesSGIXReq *) pc;
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
CARD32 *attribs;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXChangeDrawableAttributesSGIXReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->drawable);
|
||||
__GLX_SWAP_INT(&req->numAttribs);
|
||||
swapl(&req->drawable);
|
||||
swapl(&req->numAttribs);
|
||||
|
||||
if (req->numAttribs > (UINT32_MAX >> 3)) {
|
||||
client->errorValue = req->numAttribs;
|
||||
@@ -477,16 +434,15 @@ __glXDispSwap_CreateWindow(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXCreateWindowReq *req = (xGLXCreateWindowReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
CARD32 *attribs;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXCreateWindowReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->fbconfig);
|
||||
__GLX_SWAP_INT(&req->window);
|
||||
__GLX_SWAP_INT(&req->glxwindow);
|
||||
__GLX_SWAP_INT(&req->numAttribs);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->fbconfig);
|
||||
swapl(&req->window);
|
||||
swapl(&req->glxwindow);
|
||||
swapl(&req->numAttribs);
|
||||
|
||||
if (req->numAttribs > (UINT32_MAX >> 3)) {
|
||||
client->errorValue = req->numAttribs;
|
||||
@@ -505,11 +461,9 @@ __glXDispSwap_DestroyWindow(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXDestroyWindowReq);
|
||||
|
||||
__GLX_SWAP_INT(&req->glxwindow);
|
||||
swapl(&req->glxwindow);
|
||||
|
||||
return __glXDisp_DestroyWindow(cl, pc);
|
||||
}
|
||||
@@ -519,11 +473,9 @@ __glXDispSwap_SwapBuffers(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXSwapBuffersReq *req = (xGLXSwapBuffersReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
__GLX_SWAP_INT(&req->drawable);
|
||||
swapl(&req->contextTag);
|
||||
swapl(&req->drawable);
|
||||
|
||||
return __glXDisp_SwapBuffers(cl, pc);
|
||||
}
|
||||
@@ -533,14 +485,12 @@ __glXDispSwap_UseXFont(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXUseXFontReq *req = (xGLXUseXFontReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
__GLX_SWAP_INT(&req->font);
|
||||
__GLX_SWAP_INT(&req->first);
|
||||
__GLX_SWAP_INT(&req->count);
|
||||
__GLX_SWAP_INT(&req->listBase);
|
||||
swapl(&req->contextTag);
|
||||
swapl(&req->font);
|
||||
swapl(&req->first);
|
||||
swapl(&req->count);
|
||||
swapl(&req->listBase);
|
||||
|
||||
return __glXDisp_UseXFont(cl, pc);
|
||||
}
|
||||
@@ -550,10 +500,8 @@ __glXDispSwap_QueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXQueryExtensionsStringReq *req = (xGLXQueryExtensionsStringReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
swapl(&req->screen);
|
||||
|
||||
return __glXDisp_QueryExtensionsString(cl, pc);
|
||||
}
|
||||
@@ -563,11 +511,9 @@ __glXDispSwap_QueryServerString(__GLXclientState * cl, GLbyte * pc)
|
||||
{
|
||||
xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->screen);
|
||||
__GLX_SWAP_INT(&req->name);
|
||||
swapl(&req->screen);
|
||||
swapl(&req->name);
|
||||
|
||||
return __glXDisp_QueryServerString(cl, pc);
|
||||
}
|
||||
@@ -578,14 +524,12 @@ __glXDispSwap_ClientInfo(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXClientInfoReq *req = (xGLXClientInfoReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXClientInfoReq);
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->major);
|
||||
__GLX_SWAP_INT(&req->minor);
|
||||
__GLX_SWAP_INT(&req->numbytes);
|
||||
swapl(&req->major);
|
||||
swapl(&req->minor);
|
||||
swapl(&req->numbytes);
|
||||
|
||||
return __glXDisp_ClientInfo(cl, pc);
|
||||
}
|
||||
@@ -596,12 +540,10 @@ __glXDispSwap_QueryContextInfoEXT(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXQueryContextInfoEXTReq *req = (xGLXQueryContextInfoEXTReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_SIZE_MATCH(xGLXQueryContextInfoEXTReq);
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
swapl(&req->context);
|
||||
|
||||
return __glXDisp_QueryContextInfoEXT(cl, pc);
|
||||
}
|
||||
@@ -615,8 +557,6 @@ __glXDispSwap_BindTexImageEXT(__GLXclientState * cl, GLbyte * pc)
|
||||
int *buffer;
|
||||
CARD32 *num_attribs;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
if ((sizeof(xGLXVendorPrivateReq) + 12) >> 2 > client->req_len)
|
||||
return BadLength;
|
||||
|
||||
@@ -627,10 +567,10 @@ __glXDispSwap_BindTexImageEXT(__GLXclientState * cl, GLbyte * pc)
|
||||
num_attribs = ((CARD32 *) (pc + 8));
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
__GLX_SWAP_INT(drawId);
|
||||
__GLX_SWAP_INT(buffer);
|
||||
__GLX_SWAP_INT(num_attribs);
|
||||
swapl(&req->contextTag);
|
||||
swapl(drawId);
|
||||
swapl(buffer);
|
||||
swapl(num_attribs);
|
||||
|
||||
return __glXDisp_BindTexImageEXT(cl, (GLbyte *) pc);
|
||||
}
|
||||
@@ -643,8 +583,6 @@ __glXDispSwap_ReleaseTexImageEXT(__GLXclientState * cl, GLbyte * pc)
|
||||
GLXDrawable *drawId;
|
||||
int *buffer;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 8);
|
||||
|
||||
pc += __GLX_VENDPRIV_HDR_SIZE;
|
||||
@@ -653,9 +591,9 @@ __glXDispSwap_ReleaseTexImageEXT(__GLXclientState * cl, GLbyte * pc)
|
||||
buffer = ((int *) (pc + 4));
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
__GLX_SWAP_INT(drawId);
|
||||
__GLX_SWAP_INT(buffer);
|
||||
swapl(&req->contextTag);
|
||||
swapl(drawId);
|
||||
swapl(buffer);
|
||||
|
||||
return __glXDisp_ReleaseTexImageEXT(cl, (GLbyte *) pc);
|
||||
}
|
||||
@@ -668,8 +606,6 @@ __glXDispSwap_CopySubBufferMESA(__GLXclientState * cl, GLbyte * pc)
|
||||
GLXDrawable *drawId;
|
||||
int *buffer;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 20);
|
||||
|
||||
(void) drawId;
|
||||
@@ -678,12 +614,12 @@ __glXDispSwap_CopySubBufferMESA(__GLXclientState * cl, GLbyte * pc)
|
||||
pc += __GLX_VENDPRIV_HDR_SIZE;
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
__GLX_SWAP_INT(pc);
|
||||
__GLX_SWAP_INT(pc + 4);
|
||||
__GLX_SWAP_INT(pc + 8);
|
||||
__GLX_SWAP_INT(pc + 12);
|
||||
__GLX_SWAP_INT(pc + 16);
|
||||
swapl(&req->contextTag);
|
||||
swapl((CARD32*)(pc));
|
||||
swapl((CARD32*)(pc + 4));
|
||||
swapl((CARD32*)(pc + 8));
|
||||
swapl((CARD32*)(pc + 12));
|
||||
swapl((CARD32*)(pc + 16));
|
||||
|
||||
return __glXDisp_CopySubBufferMESA(cl, pc);
|
||||
|
||||
@@ -696,14 +632,12 @@ __glXDispSwap_GetDrawableAttributesSGIX(__GLXclientState * cl, GLbyte * pc)
|
||||
xGLXVendorPrivateWithReplyReq *req = (xGLXVendorPrivateWithReplyReq *) pc;
|
||||
CARD32 *data;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_SIZE_MATCH(xGLXGetDrawableAttributesSGIXReq);
|
||||
|
||||
data = (CARD32 *) (req + 1);
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->contextTag);
|
||||
__GLX_SWAP_INT(data);
|
||||
swapl(&req->contextTag);
|
||||
swapl(data);
|
||||
|
||||
return __glXDisp_GetDrawableAttributesSGIX(cl, pc);
|
||||
}
|
||||
@@ -714,12 +648,10 @@ __glXDispSwap_GetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
|
||||
ClientPtr client = cl->client;
|
||||
xGLXGetDrawableAttributesReq *req = (xGLXGetDrawableAttributesReq *) pc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xGLXGetDrawableAttributesReq);
|
||||
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->drawable);
|
||||
swapl(&req->drawable);
|
||||
|
||||
return __glXDisp_GetDrawableAttributes(cl, pc);
|
||||
}
|
||||
@@ -761,12 +693,11 @@ __glXDispSwap_VendorPrivate(__GLXclientState * cl, GLbyte * pc)
|
||||
GLint vendorcode;
|
||||
__GLXdispatchVendorPrivProcPtr proc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
REQUEST_AT_LEAST_SIZE(xGLXVendorPrivateReq);
|
||||
|
||||
req = (xGLXVendorPrivateReq *) pc;
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->vendorCode);
|
||||
swapl(&req->vendorCode);
|
||||
|
||||
vendorcode = req->vendorCode;
|
||||
|
||||
@@ -789,12 +720,11 @@ __glXDispSwap_VendorPrivateWithReply(__GLXclientState * cl, GLbyte * pc)
|
||||
GLint vendorcode;
|
||||
__GLXdispatchVendorPrivProcPtr proc;
|
||||
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
REQUEST_AT_LEAST_SIZE(xGLXVendorPrivateWithReplyReq);
|
||||
|
||||
req = (xGLXVendorPrivateWithReplyReq *) pc;
|
||||
swaps(&req->length);
|
||||
__GLX_SWAP_INT(&req->vendorCode);
|
||||
swapl(&req->vendorCode);
|
||||
|
||||
vendorcode = req->vendorCode;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user