fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: Guard some of the bind_extensions() code with the same conditions as glx_screens frontend_screen member.

Browse source 
Configution like simple MacOS builds do not have `frontend_screen` and fail to build.

Fixes: 34dea2b38e ("glx: unify extension binding")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12317

Tested-by: Yurii Kolesnykov <root@yurikoles.com>
(cherry picked from commit 48ebbe2777)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33113>
This commit is contained in:
duncan.hopkins 2024-12-16 11:42:33 +00:00 • committed by Dylan Baker
parent 267e70ecd1
commit ec927daa99
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -674,7 +674,7 @@
"description": "glx: Guard some of the bind_extensions() code with the same conditions as `glx_screen`s `frontend_screen` member.",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "34dea2b38eb336e0414d60b168b9209e029a8cad",
"notes": null

2
src/glx/glxext.c
View file

@ -790,6 +790,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName)
__glXEnableDirectExtension(psc, "GLX_INTEL_swap_event");
}
#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
mask = driGetAPIMask(psc->frontend_screen);
__glXEnableDirectExtension(psc, "GLX_ARB_create_context");
@ -846,6 +847,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName)
psc->keep_native_window_glx_drawable = keep_native_window_glx_drawable;
}
}
#endif
}