egl/x11: auth with xserver before attempting to open the dri module
authorEmil Velikov <emil.l.velikov@gmail.com>
Wed, 29 Jul 2015 16:19:07 +0000 (17:19 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Fri, 7 Aug 2015 18:16:59 +0000 (19:16 +0100)
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 <emil.l.velikov@gmail.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
src/egl/drivers/dri2/platform_x11.c

index a251694b873d7bd7bf44aa545769ffafc8eb8188..df08a8a8303a9f75c0167d5d84361285a57814ab 100644 (file)
@@ -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;