From 3639ab4ce25dc82a3f8592b7322198f1d2aca5f9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 16 Oct 2012 14:56:25 -0400 Subject: [PATCH] dri2: Don't bother with xf86LoaderCheckSymbol("DRI2Connect") The DRI2 code is now built-in to the server, even for Xorg. The only thing this could protect against is trying to run a libglx built with DRI2 support against an Xorg built without it, which is firmly in "doctor it hurts when I do this" territory. Reviewed-by: Peter Hutterer Reviewed-by: Ian Romanick Signed-off-by: Adam Jackson --- glx/glxdri2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glx/glxdri2.c b/glx/glxdri2.c index 8a1fa4159..f662b2188 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -941,8 +941,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) if (screen == NULL) return NULL; - if (!xf86LoaderCheckSymbol("DRI2Connect") || - !DRI2Connect(serverClient, pScreen, DRI2DriverDRI, + if (!DRI2Connect(serverClient, pScreen, DRI2DriverDRI, &screen->fd, &driverName, &deviceName)) { LogMessage(X_INFO, "AIGLX: Screen %d is not DRI2 capable\n", pScreen->myNum);