summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--GL/glx/glxdri.c4
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 <krh@redhat.com>
+
+ * 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 <ajax@freedesktop.org>
* 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;
}