Module: Mesa Branch: staging/23.3 Commit: 2d842a3f3bf8781ad5a001bb6c109933f5f7564c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d842a3f3bf8781ad5a001bb6c109933f5f7564c
Author: Michel Dänzer <mdaen...@redhat.com> Date: Thu Dec 14 11:32:53 2023 +0100 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) --- .pick_status.json | 2 +- src/gallium/frontends/dri/dri_util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5be7afcb4ec..a28cf6665db 100644 --- 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 2476121634a..201fc7f63d4 100644 --- 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;
