Module: Mesa Branch: staging/23.3 Commit: 0bbbc9e7102594590afa33e7a73d4e8a55af459e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bbbc9e7102594590afa33e7a73d4e8a55af459e
Author: Michel Dänzer <[email protected]> Date: Thu Dec 14 11:43:44 2023 +0100 glx: Handle IGNORE_GLX_SWAP_METHOD_OML regardless of GLX_USE_APPLEGL Avoids tons of WARNING: unknown fbconfig attribute from server: tag 0x8060 value 0x8063 messages with LIBGL_DEBUG=verbose. 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 f0594915e631877bcdf8ce67636143a017b41fb1) --- .pick_status.json | 2 +- src/glx/glxext.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a28cf6665db..a6307c1eae2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -514,7 +514,7 @@ "description": "glx: Handle IGNORE_GLX_SWAP_METHOD_OML regardless of GLX_USE_APPLEGL", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e64ab3e4a94c4e8baee3bec3a5eb4d098b8e7193", "notes": null diff --git a/src/glx/glxext.c b/src/glx/glxext.c index 7712e54c1d6..39d5f08bdcf 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -563,12 +563,11 @@ __glXInitializeVisualConfigFromTags(struct glx_config * config, int count, case GLX_SAMPLES_SGIS: config->samples = *bp++; break; -#ifdef GLX_USE_APPLEGL case IGNORE_GLX_SWAP_METHOD_OML: /* We ignore this tag. See the comment above this function. */ ++bp; break; -#else +#ifndef GLX_USE_APPLEGL case GLX_BIND_TO_TEXTURE_RGB_EXT: config->bindToTextureRgb = *bp++; break;
