From 7e085f52b6f07c076bd3bcfdce27c17d14d7822e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Sun, 2 Apr 2006 22:31:13 +0000 Subject: [PATCH] Use xf86LoaderCheckSymbol to check for DRI symbols instead of dlsym, avoiding RTLD_DEFAULT. (__glXDRIscreenProbe): Change GLX-DRI to AIGLX in LogMessage for consitency. --- ChangeLog | 7 +++++++ GL/glx/glxdri.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0d16e507..35e8651bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-02 Kristian Høgsberg + + * GL/glx/glxdri.c (__glXDRIscreenProbe): Use xf86LoaderCheckSymbol + to check for DRI symbols instead of dlsym, avoiding RTLD_DEFAULT. + (__glXDRIscreenProbe): Change GLX-DRI to AIGLX in LogMessage for + consitency. + 2006-04-02 Adam Jackson * hw/kdrive/ati/Makefile.am: diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c index d70273a20..4935b0aca 100644 --- a/GL/glx/glxdri.c +++ b/GL/glx/glxdri.c @@ -724,7 +724,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) char filename[128]; Bool isCapable; - if (dlsym (RTLD_DEFAULT, "DRIQueryDirectRenderingCapable") == NULL) { + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable")) { LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n"); return NULL; } @@ -917,7 +917,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) xfree(screen); - LogMessage(X_ERROR, "GLX-DRI: reverting to software rendering\n"); + LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); return NULL; }