gallium/dri: Return __DRI_ATTRIB_SWAP_UNDEFINED for _SWAP_METHOD

In contrast to __DRI_ATTRIB_SWAP_EXCHANGE, this is compatible with Mesa
< 23.3 on the client side.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10080
Fixes: e64ab3e4a94c ("glx: Delete support for GLX_OML_swap_method.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26685>
(cherry picked from commit 9548f969bda1075b20dd56a73cbf1e35c0cf7aba)

diff --git a/.pick_status.json b/.pick_status.json
index 5be7afc..a28cf66 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -524,7 +524,7 @@
         "description": "gallium/dri: Return __DRI_ATTRIB_SWAP_UNDEFINED for _SWAP_METHOD",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e64ab3e4a94c4e8baee3bec3a5eb4d098b8e7193",
         "notes": null

diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index 2476121..201fc7f 100644 (file)
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -326,7 +326,7 @@ driGetConfigAttribIndex(const __DRIconfig *config,
          * for the X server's sake, and EGL will expect us to handle it because
          * it iterates all __DRI_ATTRIBs.
          */
-        *value = __DRI_ATTRIB_SWAP_EXCHANGE;
+        *value = __DRI_ATTRIB_SWAP_UNDEFINED;
         break;
     case __DRI_ATTRIB_MAX_SWAP_INTERVAL:
         *value = INT_MAX;