Module: Mesa Branch: master Commit: 2c7b6cf512a775a37677b1e467d2af952c449dae URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c7b6cf512a775a37677b1e467d2af952c449dae
Author: Emil Velikov <[email protected]> Date: Wed Jul 29 17:19:07 2015 +0100 egl/x11: auth with xserver before attempting to open the dri module No real change, apart from keeping the calls to the underlying winsys (x11) next to each other. Just like platform_wayland. Signed-off-by: Emil Velikov <[email protected]> Acked-by: Alex Deucher <[email protected]> Reviewed-by: Eric Anholt <[email protected]> --- src/egl/drivers/dri2/platform_x11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index a251694..df08a8a 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1251,11 +1251,11 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) if (!dri2_x11_connect(dri2_dpy)) goto cleanup_conn; - if (!dri2_load_driver(disp)) + if (!dri2_x11_local_authenticate(disp)) goto cleanup_fd; - if (!dri2_x11_local_authenticate(disp)) - goto cleanup_driver; + if (!dri2_load_driver(disp)) + goto cleanup_fd; if (dri2_dpy->dri2_minor >= 1) { dri2_dpy->dri2_loader_extension.base.name = __DRI_DRI2_LOADER; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
