frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dri3: drop swapping request length fields 

The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-06 14:44:31 +02:00 committed by Marge Bot
parent 7e2bbba067
commit d9760ad127
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dri3/dri3_request.c
View File

@ -676,8 +676,6 @@ sproc_dri3_query_version(ClientPtr client)
{ {
REQUEST(xDRI3QueryVersionReq); REQUEST(xDRI3QueryVersionReq);
REQUEST_SIZE_MATCH(xDRI3QueryVersionReq); REQUEST_SIZE_MATCH(xDRI3QueryVersionReq);
swaps(&stuff->length);
swapl(&stuff->majorVersion); swapl(&stuff->majorVersion);
swapl(&stuff->minorVersion); swapl(&stuff->minorVersion);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
@ -688,8 +686,6 @@ sproc_dri3_open(ClientPtr client)
{ {
REQUEST(xDRI3OpenReq); REQUEST(xDRI3OpenReq);
REQUEST_SIZE_MATCH(xDRI3OpenReq); REQUEST_SIZE_MATCH(xDRI3OpenReq);
swaps(&stuff->length);
swapl(&stuff->drawable); swapl(&stuff->drawable);
swapl(&stuff->provider); swapl(&stuff->provider);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
@ -700,8 +696,6 @@ sproc_dri3_pixmap_from_buffer(ClientPtr client)
{ {
REQUEST(xDRI3PixmapFromBufferReq); REQUEST(xDRI3PixmapFromBufferReq);
REQUEST_SIZE_MATCH(xDRI3PixmapFromBufferReq); REQUEST_SIZE_MATCH(xDRI3PixmapFromBufferReq);
swaps(&stuff->length);
swapl(&stuff->pixmap); swapl(&stuff->pixmap);
swapl(&stuff->drawable); swapl(&stuff->drawable);
swapl(&stuff->size); swapl(&stuff->size);
@ -716,8 +710,6 @@ sproc_dri3_buffer_from_pixmap(ClientPtr client)
{ {
REQUEST(xDRI3BufferFromPixmapReq); REQUEST(xDRI3BufferFromPixmapReq);
REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq); REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq);
swaps(&stuff->length);
swapl(&stuff->pixmap); swapl(&stuff->pixmap);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
} }
@ -727,8 +719,6 @@ sproc_dri3_fence_from_fd(ClientPtr client)
{ {
REQUEST(xDRI3FenceFromFDReq); REQUEST(xDRI3FenceFromFDReq);
REQUEST_SIZE_MATCH(xDRI3FenceFromFDReq); REQUEST_SIZE_MATCH(xDRI3FenceFromFDReq);
swaps(&stuff->length);
swapl(&stuff->drawable); swapl(&stuff->drawable);
swapl(&stuff->fence); swapl(&stuff->fence);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
@ -739,8 +729,6 @@ sproc_dri3_fd_from_fence(ClientPtr client)
{ {
REQUEST(xDRI3FDFromFenceReq); REQUEST(xDRI3FDFromFenceReq);
REQUEST_SIZE_MATCH(xDRI3FDFromFenceReq); REQUEST_SIZE_MATCH(xDRI3FDFromFenceReq);
swaps(&stuff->length);
swapl(&stuff->drawable); swapl(&stuff->drawable);
swapl(&stuff->fence); swapl(&stuff->fence);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
@ -751,8 +739,6 @@ sproc_dri3_get_supported_modifiers(ClientPtr client)
{ {
REQUEST(xDRI3GetSupportedModifiersReq); REQUEST(xDRI3GetSupportedModifiersReq);
REQUEST_SIZE_MATCH(xDRI3GetSupportedModifiersReq); REQUEST_SIZE_MATCH(xDRI3GetSupportedModifiersReq);
swaps(&stuff->length);
swapl(&stuff->window); swapl(&stuff->window);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
} }
@ -762,8 +748,6 @@ sproc_dri3_pixmap_from_buffers(ClientPtr client)
{ {
REQUEST(xDRI3PixmapFromBuffersReq); REQUEST(xDRI3PixmapFromBuffersReq);
REQUEST_SIZE_MATCH(xDRI3PixmapFromBuffersReq); REQUEST_SIZE_MATCH(xDRI3PixmapFromBuffersReq);
swaps(&stuff->length);
swapl(&stuff->pixmap); swapl(&stuff->pixmap);
swapl(&stuff->window); swapl(&stuff->window);
swaps(&stuff->width); swaps(&stuff->width);
@ -785,8 +769,6 @@ sproc_dri3_buffers_from_pixmap(ClientPtr client)
{ {
REQUEST(xDRI3BuffersFromPixmapReq); REQUEST(xDRI3BuffersFromPixmapReq);
REQUEST_SIZE_MATCH(xDRI3BuffersFromPixmapReq); REQUEST_SIZE_MATCH(xDRI3BuffersFromPixmapReq);
swaps(&stuff->length);
swapl(&stuff->pixmap); swapl(&stuff->pixmap);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
} }
@ -807,8 +789,6 @@ sproc_dri3_import_syncobj(ClientPtr client)
{ {
REQUEST(xDRI3ImportSyncobjReq); REQUEST(xDRI3ImportSyncobjReq);
REQUEST_SIZE_MATCH(xDRI3ImportSyncobjReq); REQUEST_SIZE_MATCH(xDRI3ImportSyncobjReq);
swaps(&stuff->length);
swapl(&stuff->syncobj); swapl(&stuff->syncobj);
swapl(&stuff->drawable); swapl(&stuff->drawable);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
@ -819,8 +799,6 @@ sproc_dri3_free_syncobj(ClientPtr client)
{ {
REQUEST(xDRI3FreeSyncobjReq); REQUEST(xDRI3FreeSyncobjReq);
REQUEST_SIZE_MATCH(xDRI3FreeSyncobjReq); REQUEST_SIZE_MATCH(xDRI3FreeSyncobjReq);
swaps(&stuff->length);
swapl(&stuff->syncobj); swapl(&stuff->syncobj);
return (*proc_dri3_vector[stuff->dri3ReqType]) (client); return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
} }