From b2a85f070d7e9820b34250ac0700917225febb85 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 25 Sep 2025 13:33:53 +0200
Subject: [PATCH] xwin: dri: inline byte-swapping

No need for having extra functions and redundant code when it can
be done with just few LoC.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xwin/dri/windowsdri.c | 80 ++++++++--------------------------------
 1 file changed, 16 insertions(+), 64 deletions(-)

diff --git a/hw/xwin/dri/windowsdri.c b/hw/xwin/dri/windowsdri.c
index 10edecf04..52ebe9616 100644
--- a/hw/xwin/dri/windowsdri.c
+++ b/hw/xwin/dri/windowsdri.c
@@ -71,6 +71,9 @@ ProcWindowsDRIQueryDirectRenderingCapable(ClientPtr client)
     REQUEST(xWindowsDRIQueryDirectRenderingCapableReq);
     REQUEST_SIZE_MATCH(xWindowsDRIQueryDirectRenderingCapableReq);
 
+    if (client->swapped)
+        swapl(&stuff->screen);
+
     xWindowsDRIQueryDirectRenderingCapableReply reply = {
         .isCapable = client->local &&
                      glxWinGetScreenAiglxIsActive(screenInfo.screens[stuff->screen])
@@ -82,11 +85,16 @@ ProcWindowsDRIQueryDirectRenderingCapable(ClientPtr client)
 static int
 ProcWindowsDRIQueryDrawable(ClientPtr client)
 {
-    int rc;
-
     REQUEST(xWindowsDRIQueryDrawableReq);
     REQUEST_SIZE_MATCH(xWindowsDRIQueryDrawableReq);
 
+    if (client->swapped) {
+        swapl(&stuff->screen);
+        swapl(&stuff->drawable);
+    }
+
+    int rc;
+
     xWindowsDRIQueryDrawableReply reply = { 0 };
     rc = glxWinQueryDrawable(client, stuff->drawable, &(reply.drawable_type), &(reply.handle));
 
@@ -107,6 +115,11 @@ ProcWindowsDRIFBConfigToPixelFormat(ClientPtr client)
     REQUEST(xWindowsDRIFBConfigToPixelFormatReq);
     REQUEST_SIZE_MATCH(xWindowsDRIFBConfigToPixelFormatReq);
 
+    if (client->swapped) {
+        swapl(&stuff->screen);
+        swapl(&stuff->fbConfigID);
+    }
+
     xWindowsDRIFBConfigToPixelFormatReply reply = {
         .pixelFormatIndex = glxWinFBConfigIDToPixelFormatIndex(stuff->screen, stuff->fbConfigID)
     };
@@ -158,67 +171,6 @@ SNotifyEvent(xWindowsDRINotifyEvent *from,
     cpswapl(from->time, to->time);
 }
 
-static int
-SProcWindowsDRIQueryVersion(ClientPtr client)
-{
-    REQUEST(xWindowsDRIQueryVersionReq);
-    return ProcWindowsDRIQueryVersion(client);
-}
-
-static int
-SProcWindowsDRIQueryDirectRenderingCapable(ClientPtr client)
-{
-    REQUEST(xWindowsDRIQueryDirectRenderingCapableReq);
-    swapl(&stuff->screen);
-    return ProcWindowsDRIQueryDirectRenderingCapable(client);
-}
-
-static int
-SProcWindowsDRIQueryDrawable(ClientPtr client)
-{
-    REQUEST(xWindowsDRIQueryDrawableReq);
-    swapl(&stuff->screen);
-    swapl(&stuff->drawable);
-    return ProcWindowsDRIQueryDrawable(client);
-}
-
-static int
-SProcWindowsDRIFBConfigToPixelFormat(ClientPtr client)
-{
-    REQUEST(xWindowsDRIFBConfigToPixelFormatReq);
-    swapl(&stuff->screen);
-    swapl(&stuff->fbConfigID);
-    return ProcWindowsDRIFBConfigToPixelFormat(client);
-}
-
-static int
-SProcWindowsDRIDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-
-    switch (stuff->data) {
-    case X_WindowsDRIQueryVersion:
-        return SProcWindowsDRIQueryVersion(client);
-
-    case X_WindowsDRIQueryDirectRenderingCapable:
-        return SProcWindowsDRIQueryDirectRenderingCapable(client);
-    }
-
-    if (!client->local)
-        return WindowsDRIErrorBase + WindowsDRIClientNotLocal;
-
-    switch (stuff->data) {
-    case X_WindowsDRIQueryDrawable:
-        return SProcWindowsDRIQueryDrawable(client);
-
-    case X_WindowsDRIFBConfigToPixelFormat:
-        return SProcWindowsDRIFBConfigToPixelFormat(client);
-
-    default:
-        return BadRequest;
-    }
-}
-
 void
 WindowsDRIExtensionInit(void)
 {
@@ -228,7 +180,7 @@ WindowsDRIExtensionInit(void)
                                  WindowsDRINumberEvents,
                                  WindowsDRINumberErrors,
                                  ProcWindowsDRIDispatch,
-                                 SProcWindowsDRIDispatch,
+                                 ProcWindowsDRIDispatch,
                                  WindowsDRIResetProc,
                                  StandardMinorOpcode))) {
         size_t i;