ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

dri: use REQUEST_HEAD_STRUCT and REQUEST_FIELD_* macros

Browse Source 
Use the new macros to make request struct parsing / field swapping
much easier.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-18 19:08:03 +02:00 committed by Enrico Weigelt
parent dc39eda42b
commit 6890d547f2
1 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
hw/xfree86/dri/xf86dri.c
View File

@ -78,13 +78,14 @@ XF86DRIResetProc(ExtensionEntry *extEntry)
static int
ProcXF86DRIQueryVersion(register ClientPtr client)
{
X_REQUEST_HEAD_STRUCT(xXF86DRIQueryVersionReq);
xXF86DRIQueryVersionReply reply = {
.majorVersion = SERVER_XF86DRI_MAJOR_VERSION,
.minorVersion = SERVER_XF86DRI_MINOR_VERSION,
.patchVersion = SERVER_XF86DRI_PATCH_VERSION
};
REQUEST_SIZE_MATCH(xXF86DRIQueryVersionReq);
if (client->swapped) {
swaps(&reply.majorVersion);
swaps(&reply.minorVersion);
@ -96,13 +97,8 @@ ProcXF86DRIQueryVersion(register ClientPtr client)
static int
ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
{
Bool isCapable;
REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
if (client->swapped)
swapl(&stuff->screen);
X_REQUEST_HEAD_STRUCT(xXF86DRIQueryDirectRenderingCapableReq);
X_REQUEST_FIELD_CARD32(screen);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
@ -111,6 +107,8 @@ ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
return BadValue;
}
Bool isCapable;
if (!DRIQueryDirectRenderingCapable(pScreen,
&isCapable)) {
return BadValue;
@ -129,13 +127,12 @@ ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
static int
ProcXF86DRIOpenConnection(register ClientPtr client)
{
X_REQUEST_HEAD_STRUCT(xXF86DRIOpenConnectionReq);
drm_handle_t hSAREA;
char *busIdString;
CARD32 busIdStringLength = 0;
REQUEST(xXF86DRIOpenConnectionReq);
REQUEST_SIZE_MATCH(xXF86DRIOpenConnectionReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
client->errorValue = stuff->screen;
@ -167,8 +164,7 @@ ProcXF86DRIOpenConnection(register ClientPtr client)
static int
ProcXF86DRIAuthConnection(register ClientPtr client)
{
REQUEST(xXF86DRIAuthConnectionReq);
REQUEST_SIZE_MATCH(xXF86DRIAuthConnectionReq);
X_REQUEST_HEAD_STRUCT(xXF86DRIAuthConnectionReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
@ -192,8 +188,7 @@ ProcXF86DRIAuthConnection(register ClientPtr client)
static int
ProcXF86DRICloseConnection(register ClientPtr client)
{
REQUEST(xXF86DRICloseConnectionReq);
REQUEST_SIZE_MATCH(xXF86DRICloseConnectionReq);
X_REQUEST_HEAD_STRUCT(xXF86DRICloseConnectionReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
@ -208,10 +203,7 @@ ProcXF86DRICloseConnection(register ClientPtr client)
static int
ProcXF86DRIGetClientDriverName(register ClientPtr client)
{
char *clientDriverName = NULL;
REQUEST(xXF86DRIGetClientDriverNameReq);
REQUEST_SIZE_MATCH(xXF86DRIGetClientDriverNameReq);
X_REQUEST_HEAD_STRUCT(xXF86DRIGetClientDriverNameReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
@ -221,6 +213,8 @@ ProcXF86DRIGetClientDriverName(register ClientPtr client)
xXF86DRIGetClientDriverNameReply reply = { 0 };
char *clientDriverName = NULL;
DRIGetClientDriverName(pScreen,
(int *) &reply.ddxDriverMajorVersion,
(int *) &reply.ddxDriverMinorVersion,
@ -239,8 +233,7 @@ ProcXF86DRIGetClientDriverName(register ClientPtr client)
static int
ProcXF86DRICreateContext(register ClientPtr client)
{
REQUEST(xXF86DRICreateContextReq);
REQUEST_SIZE_MATCH(xXF86DRICreateContextReq);
X_REQUEST_HEAD_STRUCT(xXF86DRICreateContextReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
@ -263,8 +256,7 @@ ProcXF86DRICreateContext(register ClientPtr client)
static int
ProcXF86DRIDestroyContext(register ClientPtr client)
{
REQUEST(xXF86DRIDestroyContextReq);
REQUEST_SIZE_MATCH(xXF86DRIDestroyContextReq);
X_REQUEST_HEAD_STRUCT(xXF86DRIDestroyContextReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
@ -282,12 +274,11 @@ ProcXF86DRIDestroyContext(register ClientPtr client)
static int
ProcXF86DRICreateDrawable(ClientPtr client)
{
X_REQUEST_HEAD_STRUCT(xXF86DRICreateDrawableReq);
DrawablePtr pDrawable;
int rc;
REQUEST(xXF86DRICreateDrawableReq);
REQUEST_SIZE_MATCH(xXF86DRICreateDrawableReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
client->errorValue = stuff->screen;
@ -312,12 +303,11 @@ ProcXF86DRICreateDrawable(ClientPtr client)
static int
ProcXF86DRIDestroyDrawable(register ClientPtr client)
{
REQUEST(xXF86DRIDestroyDrawableReq);
X_REQUEST_HEAD_STRUCT(xXF86DRIDestroyDrawableReq);
DrawablePtr pDrawable;
int rc;
REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
client->errorValue = stuff->screen;
@ -340,15 +330,14 @@ ProcXF86DRIDestroyDrawable(register ClientPtr client)
static int
ProcXF86DRIGetDrawableInfo(register ClientPtr client)
{
X_REQUEST_HEAD_STRUCT(xXF86DRIGetDrawableInfoReq);
DrawablePtr pDrawable;
int X, Y, W, H;
drm_clip_rect_t *pClipRects;
drm_clip_rect_t *pBackClipRects;
int backX, backY, rc;
REQUEST(xXF86DRIGetDrawableInfoReq);
REQUEST_SIZE_MATCH(xXF86DRIGetDrawableInfoReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
client->errorValue = stuff->screen;
@ -424,12 +413,11 @@ ProcXF86DRIGetDrawableInfo(register ClientPtr client)
static int
ProcXF86DRIGetDeviceInfo(register ClientPtr client)
{
X_REQUEST_HEAD_STRUCT(xXF86DRIGetDeviceInfoReq);
drm_handle_t hFrameBuffer;
void *pDevPrivate;
REQUEST(xXF86DRIGetDeviceInfoReq);
REQUEST_SIZE_MATCH(xXF86DRIGetDeviceInfoReq);
ScreenPtr pScreen = dixGetScreenPtr(stuff->screen);
if (!pScreen) {
client->errorValue = stuff->screen;