frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use xf86LoaderCheckSymbol to check for DRI symbols instead of dlsym, 

avoiding RTLD_DEFAULT. (__glXDRIscreenProbe): Change GLX-DRI to AIGLX
    in LogMessage for consitency.
This commit is contained in:
Kristian Høgsberg 2006-04-02 22:31:13 +00:00
parent b2097b99a2
commit 7e085f52b6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2006-04-02 Adam Jackson <ajax@freedesktop.org>
* hw/kdrive/ati/Makefile.am: * hw/kdrive/ati/Makefile.am:

4
GL/glx/glxdri.c
View File

@ -724,7 +724,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
char filename[128]; char filename[128];
Bool isCapable; Bool isCapable;
if (dlsym (RTLD_DEFAULT, "DRIQueryDirectRenderingCapable") == NULL) { if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable")) {
LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n"); LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n");
return NULL; return NULL;
} }
@ -917,7 +917,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
xfree(screen); xfree(screen);
LogMessage(X_ERROR, "GLX-DRI: reverting to software rendering\n"); LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
return NULL; return NULL;
} }